+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "netifd.h"
#include "interface.h"
+#include "ubus.h"
char *hotplug_cmd_path = DEFAULT_HOTPLUG_PATH;
static struct interface *current;
};
static void
-run_cmd(const char *ifname, bool up)
+run_cmd(const char *ifname, const char *device, bool up)
{
char *argv[3];
int pid;
setenv("ACTION", up ? "ifup" : "ifdown", 1);
setenv("INTERFACE", ifname, 1);
+ if (device)
+ setenv("DEVICE", device, 1);
argv[0] = hotplug_cmd_path;
- argv[1] = "network";
+ argv[1] = "iface";
argv[2] = NULL;
execvp(argv[0], argv);
exit(127);
static void
call_hotplug(void)
{
+ const char *device = NULL;
if (list_empty(&pending))
return;
current_ev = current->hotplug_ev;
list_del_init(¤t->hotplug_list);
- D(SYSTEM, "Call hotplug handler for interface '%s'\n", current->name);
- run_cmd(current->name, current_ev == IFEV_UP);
+ if (current_ev == IFEV_UP && current->l3_dev.dev)
+ device = current->l3_dev.dev->ifname;
+
+ D(SYSTEM, "Call hotplug handler for interface '%s' (%s)\n", current->name, device ? device : "none");
+ run_cmd(current->name, device, current_ev == IFEV_UP);
}
static void
* When queueing an event that is the same as the one waiting for
* completion, remove the interface from the queue
*/
-void
+static void
interface_queue_event(struct interface *iface, enum interface_event ev)
{
enum interface_event last_ev;
D(SYSTEM, "Queue hotplug handler for interface '%s'\n", iface->name);
+ netifd_ubus_interface_event(iface, ev == IFEV_UP);
if (current == iface)
last_ev = current_ev;
else
iface->hotplug_ev = ev;
if (last_ev == ev && !list_empty(&iface->hotplug_list))
- list_del(&iface->hotplug_list);
+ list_del_init(&iface->hotplug_list);
else if (last_ev != ev && list_empty(&iface->hotplug_list))
list_add(&iface->hotplug_list, &pending);
call_hotplug();
}
-void
+static void
interface_dequeue_event(struct interface *iface)
{
if (iface == current)
if (!list_empty(&iface->hotplug_list))
list_del_init(&iface->hotplug_list);
}
+
+static void interface_event_cb(struct interface_user *dep, struct interface *iface,
+ enum interface_event ev)
+{
+ switch (ev) {
+ case IFEV_UP:
+ case IFEV_DOWN:
+ interface_queue_event(iface, ev);
+ break;
+ case IFEV_FREE:
+ case IFEV_RELOAD:
+ interface_dequeue_event(iface);
+ break;
+ }
+}
+
+static struct interface_user event_user = {
+ .cb = interface_event_cb
+};
+
+static void __init interface_event_init(void)
+{
+ interface_add_user(&event_user, NULL);
+}