* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
+
+/* The wireless configuration is projected on the following objects
+ *
+ * 1. wireless device
+ * 2. wireless interface
+ * 3. wireless vlan
+ * 4. wireless station
+ *
+ * A wireless device is a phy or simplified a wireless card.
+ * A wireless interface is a SSID on a phy.
+ * A wireless vlan can be assigned to a wireless interface. A wireless interface can
+ * have multiple vlans.
+ * A wireless station is a client connected to an wireless interface.
+ */
+
#include <signal.h>
#include "netifd.h"
#include "wireless.h"
enum {
VIF_ATTR_DISABLED,
VIF_ATTR_NETWORK,
+ VIF_ATTR_NETWORK_VLAN,
+ VIF_ATTR_BRIDGE_ISOLATE,
VIF_ATTR_ISOLATE,
VIF_ATTR_MODE,
+ VIF_ATTR_PROXYARP,
+ VIF_ATTR_MCAST_TO_UCAST,
__VIF_ATTR_MAX,
};
static const struct blobmsg_policy vif_policy[__VIF_ATTR_MAX] = {
[VIF_ATTR_DISABLED] = { .name = "disabled", .type = BLOBMSG_TYPE_BOOL },
[VIF_ATTR_NETWORK] = { .name = "network", .type = BLOBMSG_TYPE_ARRAY },
+ [VIF_ATTR_NETWORK_VLAN] = { .name = "network_vlan", .type = BLOBMSG_TYPE_ARRAY },
+ [VIF_ATTR_BRIDGE_ISOLATE] = { .name = "bridge_isolate", .type = BLOBMSG_TYPE_BOOL },
[VIF_ATTR_ISOLATE] = { .name = "isolate", .type = BLOBMSG_TYPE_BOOL },
[VIF_ATTR_MODE] = { .name = "mode", .type = BLOBMSG_TYPE_STRING },
+ [VIF_ATTR_PROXYARP] = { .name = "proxy_arp", .type = BLOBMSG_TYPE_BOOL },
+ [VIF_ATTR_MCAST_TO_UCAST] = { .name = "multicast_to_unicast", .type = BLOBMSG_TYPE_BOOL },
};
static const struct uci_blob_param_list vif_param = {
.params = vif_policy,
};
+enum {
+ VLAN_ATTR_DISABLED,
+ VLAN_ATTR_NETWORK,
+ VLAN_ATTR_NETWORK_VLAN,
+ VLAN_ATTR_BRIDGE_ISOLATE,
+ VLAN_ATTR_ISOLATE,
+ VLAN_ATTR_MCAST_TO_UCAST,
+ __VLAN_ATTR_MAX,
+};
+
+static const struct blobmsg_policy vlan_policy[__VLAN_ATTR_MAX] = {
+ [VLAN_ATTR_DISABLED] = { .name = "disabled", .type = BLOBMSG_TYPE_BOOL },
+ [VLAN_ATTR_NETWORK] = { .name = "network", .type = BLOBMSG_TYPE_ARRAY },
+ [VLAN_ATTR_NETWORK_VLAN] = { .name = "network_vlan", .type = BLOBMSG_TYPE_ARRAY },
+ [VLAN_ATTR_BRIDGE_ISOLATE] = { .name = "bridge_isolate", .type = BLOBMSG_TYPE_BOOL },
+ [VLAN_ATTR_ISOLATE] = { .name = "isolate", .type = BLOBMSG_TYPE_BOOL },
+ [VLAN_ATTR_MCAST_TO_UCAST] = { .name = "multicast_to_unicast", .type = BLOBMSG_TYPE_BOOL },
+};
+
+static const struct uci_blob_param_list vlan_param = {
+ .n_params = ARRAY_SIZE(vlan_policy),
+ .params = vlan_policy,
+};
+
+enum {
+ STA_ATTR_DISABLED,
+ __STA_ATTR_MAX,
+};
+
+static const struct blobmsg_policy sta_policy[__STA_ATTR_MAX] = {
+ [STA_ATTR_DISABLED] = { .name = "disabled", .type = BLOBMSG_TYPE_BOOL },
+};
+
+static const struct uci_blob_param_list station_param = {
+ .n_params = ARRAY_SIZE(sta_policy),
+ .params = sta_policy,
+};
+
static void
wireless_handler_stop(struct wireless_device *wdev)
{
put_container(struct blob_buf *buf, struct blob_attr *attr, const char *name)
{
void *c = blobmsg_open_table(buf, name);
- blob_put_raw(buf, blob_data(attr), blob_len(attr));
+ blob_put_raw(buf, blobmsg_data(attr), blobmsg_len(attr));
blobmsg_close_table(buf, c);
}
vif_config_add_bridge(struct blob_buf *buf, struct blob_attr *networks, bool prepare)
{
struct interface *iface;
- struct device *dev = NULL;
+ struct device *dev = NULL, *orig_dev;
struct blob_attr *cur;
const char *network;
- int rem;
+ size_t rem;
if (!networks)
return;
if (!dev)
return;
- if (!dev->type->bridge_capability)
+ if (!dev->hotplug_ops)
return;
}
if (!dev)
return;
+ orig_dev = dev;
if (dev->hotplug_ops && dev->hotplug_ops->prepare)
- dev->hotplug_ops->prepare(dev);
+ dev->hotplug_ops->prepare(dev, &dev);
+
+ if (!dev || !dev->type->bridge_capability)
+ return;
blobmsg_add_string(buf, "bridge", dev->ifname);
+ blobmsg_add_string(buf, "bridge-ifname", orig_dev->ifname);
if (dev->settings.flags & DEV_OPT_MULTICAST_TO_UNICAST)
blobmsg_add_u8(buf, "multicast_to_unicast",
prepare_config(struct wireless_device *wdev, struct blob_buf *buf, bool up)
{
struct wireless_interface *vif;
- void *l, *i;
+ struct wireless_vlan *vlan;
+ struct wireless_station *sta;
+ void *l, *i, *j, *k;
blob_buf_init(&b, 0);
put_container(&b, wdev->config, "config");
l = blobmsg_open_table(&b, "interfaces");
vlist_for_each_element(&wdev->interfaces, vif, node) {
+ if (vif->disabled)
+ continue;
+
i = blobmsg_open_table(&b, vif->name);
vif_config_add_bridge(&b, vif->network, up);
put_container(&b, vif->config, "config");
if (vif->data)
blobmsg_add_blob(&b, vif->data);
+
+ j = blobmsg_open_table(&b, "vlans");
+ vlist_for_each_element(&vif->vlans, vlan, node) {
+ k = blobmsg_open_table(&b, vlan->name);
+ vif_config_add_bridge(&b, vlan->network, up);
+ put_container(&b, vlan->config, "config");
+ if (vlan->data)
+ blobmsg_add_blob(&b, vlan->data);
+ blobmsg_close_table(&b, k);
+ }
+ blobmsg_close_table(&b, j);
+
+ j = blobmsg_open_table(&b, "stas");
+ vlist_for_each_element(&vif->stations, sta, node) {
+ k = blobmsg_open_table(&b, sta->name);
+ put_container(&b, sta->config, "config");
+ if (sta->data)
+ blobmsg_add_blob(&b, sta->data);
+ blobmsg_close_table(&b, k);
+ }
+ blobmsg_close_table(&b, j);
blobmsg_close_table(&b, i);
}
blobmsg_close_table(&b, l);
+
}
static bool
static void
wireless_process_free(struct wireless_device *wdev, struct wireless_process *proc)
{
- D(WIRELESS, "Wireless device '%s' free pid %d\n", wdev->name, proc->pid);
+ D(WIRELESS, "Wireless device '%s' free pid %d", wdev->name, proc->pid);
list_del(&proc->list);
free(proc);
list_for_each_entry_safe(proc, tmp, &wdev->script_proc, list) {
bool check = wireless_process_check(proc);
- if (check) {
- D(WIRELESS, "Wireless device '%s' kill pid %d\n", wdev->name, proc->pid);
+ if (check && !proc->keep) {
+ D(WIRELESS, "Wireless device '%s' kill pid %d", wdev->name, proc->pid);
kill(proc->pid, signal);
}
wireless_device_free_state(struct wireless_device *wdev)
{
struct wireless_interface *vif;
+ struct wireless_vlan *vlan;
+ struct wireless_station *sta;
wireless_handler_stop(wdev);
uloop_timeout_cancel(&wdev->script_check);
free(vif->data);
vif->data = NULL;
vif->ifname = NULL;
+ vlist_for_each_element(&vif->vlans, vlan, node) {
+ free(vlan->data);
+ vlan->data = NULL;
+ vlan->ifname = NULL;
+ }
+ vlist_for_each_element(&vif->stations, sta, node) {
+ free(sta->data);
+ sta->data = NULL;
+ }
}
}
-static void wireless_interface_handle_link(struct wireless_interface *vif, bool up)
+static void wireless_device_set_mcast_to_unicast(struct device *dev, int val)
+{
+ if (val < 0) {
+ dev->settings.flags &= ~DEV_OPT_MULTICAST_TO_UNICAST;
+ return;
+ }
+
+ dev->settings.multicast_to_unicast = !!val;
+ dev->settings.flags |= DEV_OPT_MULTICAST_TO_UNICAST;
+}
+
+static void wireless_interface_handle_link(struct wireless_interface *vif, const char *ifname, bool up)
{
struct interface *iface;
struct blob_attr *cur;
const char *network;
- int rem;
+ struct device *dev;
+ size_t rem;
if (!vif->network || !vif->ifname)
return;
+ if (!ifname)
+ ifname = vif->ifname;
+
+ if (!up)
+ goto out;
+
+ dev = __device_get(ifname, 2, false);
+ if (!dev)
+ goto out;
+
+ dev->wireless = true;
+ dev->settings.flags |= DEV_OPT_ISOLATE;
+ dev->settings.isolate = vif->bridge_isolate;
+
+ if (strcmp(ifname, vif->ifname) != 0)
+ goto out;
+
+ dev->wireless_isolate = vif->isolate;
+ dev->wireless_proxyarp = vif->proxyarp;
+ dev->wireless_ap = vif->ap_mode;
+ wireless_device_set_mcast_to_unicast(dev, vif->multicast_to_unicast);
+ dev->bpdu_filter = dev->wireless_ap;
+
+out:
+ blobmsg_for_each_attr(cur, vif->network, rem) {
+ network = blobmsg_data(cur);
+
+ iface = vlist_find(&interfaces, network, iface, node);
+ if (!iface)
+ continue;
+
+ interface_handle_link(iface, ifname, vif->network_vlan, up, true);
+ }
+}
+
+static void wireless_vlan_handle_link(struct wireless_vlan *vlan, bool up)
+{
+ struct interface *iface;
+ struct blob_attr *cur;
+ const char *network;
+ size_t rem;
+
+ if (!vlan->network || !vlan->ifname)
+ return;
+
if (up) {
- struct device *dev = device_get(vif->ifname, 2);
+ struct device *dev = device_get(vlan->ifname, 2);
if (dev) {
- dev->wireless_isolate = vif->isolate;
+ dev->wireless_isolate = vlan->isolate;
dev->wireless = true;
- dev->wireless_ap = vif->ap_mode;
+ dev->wireless_ap = true;
+ dev->bpdu_filter = true;
+ dev->settings.flags |= DEV_OPT_ISOLATE;
+ dev->settings.isolate = vlan->bridge_isolate;
+ wireless_device_set_mcast_to_unicast(dev, vlan->multicast_to_unicast);
}
}
- blobmsg_for_each_attr(cur, vif->network, rem) {
+ blobmsg_for_each_attr(cur, vlan->network, rem) {
network = blobmsg_data(cur);
iface = vlist_find(&interfaces, network, iface, node);
if (!iface)
continue;
- interface_handle_link(iface, vif->ifname, up, true);
+ interface_handle_link(iface, vlan->ifname, vlan->network_vlan, up, true);
}
}
return;
wireless_handler_stop(wdev);
- D(WIRELESS, "Cancel wireless device '%s' setup\n", wdev->name);
+ D(WIRELESS, "Cancel wireless device '%s' setup", wdev->name);
wdev->cancel = true;
uloop_timeout_set(&wdev->timeout, 10 * 1000);
}
if (wdev->serialize)
handler_pending = true;
- D(WIRELESS, "Wireless device '%s' run %s handler\n", wdev->name, action);
+ D(WIRELESS, "Wireless device '%s' run %s handler", wdev->name, action);
if (!up && wdev->prev_config) {
config = blobmsg_format_json(wdev->prev_config, true);
free(wdev->prev_config);
wdev->prev_config = NULL;
} else {
prepare_config(wdev, &b, up);
+ free(wdev->prev_config);
+ wdev->prev_config = up ? blob_memdup(b.head) : NULL;
config = blobmsg_format_json(b.head, true);
}
argv[i] = NULL;
if (up && pipe(fds) == 0) {
+ if (wdev->script_proc_fd.fd >= 0)
+ wireless_close_script_proc_fd(wdev);
+
wdev->script_proc_fd.fd = fds[0];
uloop_fd_add(&wdev->script_proc_fd,
ULOOP_READ | ULOOP_EDGE_TRIGGER);
if (!wdev->autostart)
return;
- if (!force && (wdev->state != IFS_DOWN || config_init))
+ if ((!force && wdev->state != IFS_DOWN) || config_init)
return;
- free(wdev->prev_config);
- wdev->prev_config = NULL;
wdev->state = IFS_SETUP;
wireless_device_run_handler(wdev, true);
}
enum interface_config_state state = wdev->config_state;
switch(state) {
- case IFC_NORMAL:
case IFC_RELOAD:
+ wdev->retry = WIRELESS_SETUP_RETRY;
+ wdev->retry_setup_failed = false;
+ fallthrough;
+ case IFC_NORMAL:
__wireless_device_set_up(wdev, 0);
wdev->config_state = IFC_NORMAL;
wireless_device_mark_down(struct wireless_device *wdev)
{
struct wireless_interface *vif;
+ struct wireless_vlan *vlan;
- D(WIRELESS, "Wireless device '%s' is now down\n", wdev->name);
+ netifd_log_message(L_NOTICE, "Wireless device '%s' is now down\n", wdev->name);
- vlist_for_each_element(&wdev->interfaces, vif, node)
- wireless_interface_handle_link(vif, false);
+
+ vlist_for_each_element(&wdev->interfaces, vif, node) {
+ wireless_interface_handle_link(vif, NULL, false);
+ vlist_for_each_element(&vif->vlans, vlan, node)
+ wireless_vlan_handle_link(vlan, false);
+ }
wireless_process_kill_all(wdev, SIGTERM, true);
wdev_handle_config_change(wdev);
}
+/* timeout callback to protect the tear down */
static void
wireless_device_setup_timeout(struct uloop_timeout *timeout)
{
wireless_device_run_handler(wdev, false);
}
+/* ubus callback network.wireless.notify, command = up */
static void
wireless_device_mark_up(struct wireless_device *wdev)
{
struct wireless_interface *vif;
+ struct wireless_vlan *vlan;
if (wdev->cancel) {
wdev->cancel = false;
return;
}
- D(WIRELESS, "Wireless device '%s' is now up\n", wdev->name);
+ netifd_log_message(L_NOTICE, "Wireless device '%s' is now up\n", wdev->name);
+ wdev->retry = WIRELESS_SETUP_RETRY;
wdev->state = IFS_UP;
- vlist_for_each_element(&wdev->interfaces, vif, node)
- wireless_interface_handle_link(vif, true);
+ vlist_for_each_element(&wdev->interfaces, vif, node) {
+ wireless_interface_handle_link(vif, NULL, true);
+ vlist_for_each_element(&vif->vlans, vlan, node)
+ wireless_vlan_handle_link(vlan, true);
+ }
}
static void
if (wdev->state == IFS_TEARDOWN || wdev->state == IFS_DOWN || wdev->cancel)
return;
+ netifd_log_message(wdev->retry ? L_WARNING : L_CRIT,
+ "Wireless device '%s' setup failed, retry=%d\n",
+ wdev->name, wdev->retry);
if (--wdev->retry < 0)
wdev->retry_setup_failed = true;
if (wdev->config_state != IFC_NORMAL)
return;
+ wdev->config_update = false;
+ if (!wdev->disabled && s == IFC_RELOAD && wdev->reconf && wdev->state == IFS_UP) {
+ wireless_device_reconf(wdev);
+ return;
+ }
+
wdev->config_state = s;
if (wdev->state == IFS_DOWN)
wdev_handle_config_change(wdev);
- else if (!wdev->reconf || wdev->state != IFS_UP)
+ else
__wireless_device_set_down(wdev);
}
static void
wdev_prepare_prev_config(struct wireless_device *wdev)
{
- if (wdev->prev_config)
- return;
-
prepare_config(wdev, &b, false);
+ free(wdev->prev_config);
wdev->prev_config = blob_memdup(b.head);
}
struct blob_attr *new_config = wd_new->config;
bool disabled = wd_new->disabled;
+ wdev->reconf = wd_new->reconf;
+ wdev->serialize = wd_new->serialize;
free(wd_new);
- wdev_prepare_prev_config(wdev);
if (blob_attr_equal(wdev->config, new_config) && wdev->disabled == disabled)
return;
- D(WIRELESS, "Update configuration of wireless device '%s'\n", wdev->name);
+ D(WIRELESS, "Update configuration of wireless device '%s'", wdev->name);
free(wdev->config);
wdev->config = blob_memdup(new_config);
wdev->disabled = disabled;
- wdev->retry_setup_failed = false;
- wdev_set_config_state(wdev, IFC_RELOAD);
+ wdev->config_update = true;
}
static void
wdev->config = blob_memdup(wdev->config);
}
+/* vlist update call for wireless device list */
static void
wdev_update(struct vlist_tree *tree, struct vlist_node *node_new,
struct vlist_node *node_old)
struct wireless_device *wd_new = container_of(node_new, struct wireless_device, node);
if (wd_old && wd_new) {
- D(WIRELESS, "Update wireless device '%s'\n", wd_old->name);
+ D(WIRELESS, "Update wireless device '%s'", wd_old->name);
wdev_change_config(wd_old, wd_new);
} else if (wd_old) {
- D(WIRELESS, "Delete wireless device '%s'\n", wd_old->name);
+ D(WIRELESS, "Delete wireless device '%s'", wd_old->name);
wdev_set_config_state(wd_old, IFC_REMOVE);
} else if (wd_new) {
- D(WIRELESS, "Create wireless device '%s'\n", wd_new->name);
+ D(WIRELESS, "Create wireless device '%s'", wd_new->name);
wdev_create(wd_new);
}
}
+/* wireless netifd script handler */
static void
wireless_add_handler(const char *script, const char *name, json_object *obj)
{
struct wireless_driver *drv;
char *name_str, *script_str;
- json_object *dev_config_obj, *iface_config_obj;
- struct uci_blob_param_list *dev_config, *iface_config;
+ json_object *dev_config_obj, *iface_config_obj, *vlan_config_obj, *station_config_obj;
+ struct uci_blob_param_list *dev_config, *iface_config, *vlan_config, *station_config;
dev_config_obj = json_get_field(obj, "device", json_type_array);
iface_config_obj = json_get_field(obj, "iface", json_type_array);
+ vlan_config_obj = json_get_field(obj, "vlan", json_type_array);
+ station_config_obj = json_get_field(obj, "station", json_type_array);
- if (!dev_config_obj || !iface_config_obj)
+ if (!dev_config_obj || !iface_config_obj || !vlan_config_obj || !station_config_obj)
return;
drv = calloc_a(sizeof(*drv),
&dev_config, sizeof(*dev_config) + sizeof(void *),
&iface_config, sizeof(*iface_config) + sizeof(void *),
+ &vlan_config, sizeof(*vlan_config) + sizeof(void *),
+ &station_config, sizeof(*station_config) + sizeof(void *),
&name_str, strlen(name) + 1,
&script_str, strlen(script) + 1);
iface_config->next[0] = &vif_param;
drv->interface.config = iface_config;
+ vlan_config->n_next = 1;
+ vlan_config->next[0] = &vlan_param;
+ drv->vlan.config = vlan_config;
+
+ station_config->n_next = 1;
+ station_config->next[0] = &station_param;
+ drv->station.config = station_config;
+
drv->device.buf = netifd_handler_parse_config(drv->device.config, dev_config_obj);
drv->interface.buf = netifd_handler_parse_config(drv->interface.config, iface_config_obj);
+ drv->vlan.buf = netifd_handler_parse_config(drv->vlan.config, vlan_config_obj);
+ drv->station.buf = netifd_handler_parse_config(drv->station.config, station_config_obj);
drv->node.key = drv->name;
avl_insert(&wireless_drivers, &drv->node);
- D(WIRELESS, "Add handler for script %s: %s\n", script, name);
+ D(WIRELESS, "Add handler for script %s: %s", script, name);
}
void wireless_init(void)
netifd_init_script_handlers(drv_fd, wireless_add_handler);
}
+/* parse blob config into the wireless interface object */
static void
wireless_interface_init_config(struct wireless_interface *vif)
{
struct blob_attr *cur;
vif->network = NULL;
- blobmsg_parse(vif_policy, __VIF_ATTR_MAX, tb, blob_data(vif->config), blob_len(vif->config));
+ blobmsg_parse_attr(vif_policy, __VIF_ATTR_MAX, tb, vif->config);
if ((cur = tb[VIF_ATTR_NETWORK]))
vif->network = cur;
- cur = tb[VIF_ATTR_ISOLATE];
- if (cur)
- vif->isolate = blobmsg_get_bool(cur);
+ if ((cur = tb[VIF_ATTR_NETWORK_VLAN]))
+ vif->network_vlan = cur;
cur = tb[VIF_ATTR_MODE];
- if (cur)
- vif->ap_mode = !strcmp(blobmsg_get_string(cur), "ap");
+ vif->ap_mode = cur && !strcmp(blobmsg_get_string(cur), "ap");
+
+ cur = tb[VIF_ATTR_BRIDGE_ISOLATE];
+ vif->bridge_isolate = cur && blobmsg_get_bool(cur);
+
+ cur = tb[VIF_ATTR_ISOLATE];
+ vif->isolate = cur && blobmsg_get_bool(cur);
+
+ cur = tb[VIF_ATTR_PROXYARP];
+ vif->proxyarp = vif->ap_mode && cur && blobmsg_get_bool(cur);
+
+ cur = tb[VIF_ATTR_MCAST_TO_UCAST];
+ vif->multicast_to_unicast = cur ? blobmsg_get_bool(cur) : -1;
}
+static void
+vif_free(struct wireless_interface *vif)
+{
+ vlist_flush_all(&vif->vlans);
+ vlist_flush_all(&vif->stations);
+ free((void *) vif->section);
+ free(vif->config);
+ free(vif);
+}
+
+/* vlist update call for wireless interface list */
static void
vif_update(struct vlist_tree *tree, struct vlist_node *node_new,
struct vlist_node *node_old)
return;
}
- D(WIRELESS, "Update wireless interface %s on device %s\n", vif_new->name, wdev->name);
- wireless_interface_handle_link(vif_old, false);
+ D(WIRELESS, "Update wireless interface %s on device %s", vif_new->name, wdev->name);
+ wireless_interface_handle_link(vif_old, NULL, false);
free(vif_old->config);
vif_old->config = blob_memdup(vif_new->config);
- vif_old->isolate = vif_new->isolate;
- vif_old->ap_mode = vif_new->ap_mode;
wireless_interface_init_config(vif_old);
free(vif_new);
} else if (vif_new) {
- D(WIRELESS, "Create new wireless interface %s on device %s\n", vif_new->name, wdev->name);
+ D(WIRELESS, "Create new wireless interface %s on device %s", vif_new->name, wdev->name);
vif_new->section = strdup(vif_new->section);
vif_new->config = blob_memdup(vif_new->config);
wireless_interface_init_config(vif_new);
} else if (vif_old) {
- D(WIRELESS, "Delete wireless interface %s on device %s\n", vif_old->name, wdev->name);
- wireless_interface_handle_link(vif_old, false);
- free((void *) vif_old->section);
- free(vif_old->config);
- free(vif_old);
+ D(WIRELESS, "Delete wireless interface %s on device %s", vif_old->name, wdev->name);
+ wireless_interface_handle_link(vif_old, NULL, false);
+ vif_free(vif_old);
+ }
+
+ wdev->config_update = true;
+}
+
+/* parse blob config into the vlan object */
+static void
+wireless_vlan_init_config(struct wireless_vlan *vlan)
+{
+ struct blob_attr *tb[__VLAN_ATTR_MAX];
+ struct blob_attr *cur;
+
+ vlan->network = NULL;
+ blobmsg_parse_attr(vlan_policy, __VLAN_ATTR_MAX, tb, vlan->config);
+
+ if ((cur = tb[VLAN_ATTR_NETWORK]))
+ vlan->network = cur;
+
+ if ((cur = tb[VLAN_ATTR_NETWORK_VLAN]))
+ vlan->network_vlan = cur;
+
+ cur = tb[VLAN_ATTR_BRIDGE_ISOLATE];
+ vlan->bridge_isolate = cur && blobmsg_get_bool(cur);
+
+ cur = tb[VLAN_ATTR_ISOLATE];
+ vlan->isolate = cur && blobmsg_get_bool(cur);
+
+ cur = tb[VLAN_ATTR_MCAST_TO_UCAST];
+ vlan->multicast_to_unicast = cur ? blobmsg_get_bool(cur) : -1;
+}
+
+/* vlist update call for vlan list */
+static void
+vlan_update(struct vlist_tree *tree, struct vlist_node *node_new,
+ struct vlist_node *node_old)
+{
+ struct wireless_vlan *vlan_old = container_of_safe(node_old, struct wireless_vlan, node);
+ struct wireless_vlan *vlan_new = container_of_safe(node_new, struct wireless_vlan, node);
+ struct wireless_interface *vif = container_of(tree, struct wireless_interface, vlans);
+ struct wireless_device *wdev = vif->wdev;
+
+ if (vlan_old && vlan_new) {
+ free((void *) vlan_old->section);
+ vlan_old->section = strdup(vlan_new->section);
+ if (blob_attr_equal(vlan_old->config, vlan_new->config)) {
+ free(vlan_new);
+ return;
+ }
+
+ D(WIRELESS, "Update wireless vlan %s on device %s", vlan_new->name, wdev->name);
+ wireless_vlan_handle_link(vlan_old, false);
+ free(vlan_old->config);
+ vlan_old->config = blob_memdup(vlan_new->config);
+ vlan_old->isolate = vlan_new->isolate;
+ wireless_vlan_init_config(vlan_old);
+ free(vlan_new);
+ } else if (vlan_new) {
+ D(WIRELESS, "Create new wireless vlan %s on device %s", vlan_new->name, wdev->name);
+ vlan_new->section = strdup(vlan_new->section);
+ vlan_new->config = blob_memdup(vlan_new->config);
+ wireless_vlan_init_config(vlan_new);
+ } else if (vlan_old) {
+ D(WIRELESS, "Delete wireless vlan %s on device %s", vlan_old->name, wdev->name);
+ wireless_vlan_handle_link(vlan_old, false);
+ free((void *) vlan_old->section);
+ free(vlan_old->config);
+ free(vlan_old);
}
- wdev_set_config_state(wdev, IFC_RELOAD);
+ wdev->config_update = true;
+}
+
+/* vlist update call for station list */
+static void
+station_update(struct vlist_tree *tree, struct vlist_node *node_new,
+ struct vlist_node *node_old)
+{
+ struct wireless_station *sta_old = container_of_safe(node_old, struct wireless_station, node);
+ struct wireless_station *sta_new = container_of_safe(node_new, struct wireless_station, node);
+ struct wireless_interface *vif = container_of(tree, struct wireless_interface, stations);
+ struct wireless_device *wdev = vif->wdev;
+
+ if (sta_old && sta_new) {
+ free((void *) sta_old->section);
+ sta_old->section = strdup(sta_new->section);
+ if (blob_attr_equal(sta_old->config, sta_new->config)) {
+ free(sta_new);
+ return;
+ }
+
+ D(WIRELESS, "Update wireless station %s on device %s", sta_new->name, wdev->name);
+ free(sta_old->config);
+ sta_old->config = blob_memdup(sta_new->config);
+ free(sta_new);
+ } else if (sta_new) {
+ D(WIRELESS, "Create new wireless station %s on device %s", sta_new->name, wdev->name);
+ sta_new->section = strdup(sta_new->section);
+ sta_new->config = blob_memdup(sta_new->config);
+ } else if (sta_old) {
+ D(WIRELESS, "Delete wireless station %s on device %s", sta_old->name, wdev->name);
+ free((void *) sta_old->section);
+ free(sta_old->config);
+ free(sta_old);
+ }
+
+ wdev->config_update = true;
}
static void
wireless_close_script_proc_fd(wdev);
}
+/* watchdog and garbage collector for wireless processes.
+ * It cleans up terminated processes. If a process is a requirement for the wireless device, it retries the setup */
static void
wireless_device_check_script_tasks(struct uloop_timeout *timeout)
{
if (wireless_process_check(proc))
continue;
- D(WIRELESS, "Wireless device '%s' pid %d has terminated\n", wdev->name, proc->pid);
+ D(WIRELESS, "Wireless device '%s' pid %d has terminated", wdev->name, proc->pid);
if (proc->required)
restart = true;
uloop_timeout_set(&wdev->script_check, 1000);
}
+/* creates a wireless device object. Called by config */
void
wireless_device_create(struct wireless_driver *drv, const char *name, struct blob_attr *data)
{
struct blob_attr *tb[__WDEV_ATTR_MAX];
struct blob_attr *cur;
- blobmsg_parse(wdev_policy, __WDEV_ATTR_MAX, tb, blob_data(data), blob_len(data));
+ blobmsg_parse_attr(wdev_policy, __WDEV_ATTR_MAX, tb, data);
wdev = calloc_a(sizeof(*wdev), &name_buf, strlen(name) + 1);
wdev->serialize = cur && blobmsg_get_bool(cur);
cur = tb[WDEV_ATTR_RECONF];
- wdev->reconf = cur && blobmsg_get_bool(cur);
+ wdev->reconf = !cur || blobmsg_get_bool(cur);
wdev->retry_setup_failed = false;
wdev->autostart = true;
vlist_add(&wireless_devices, &wdev->node, wdev->name);
}
-void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *data, const char *section)
+/* creates a wireless station object. Called by config */
+void
+wireless_station_create(struct wireless_interface *vif, struct blob_attr *data, const char *section)
+{
+ struct wireless_station *sta;
+ struct blob_attr *tb[__STA_ATTR_MAX];
+ struct blob_attr *cur;
+ char *name_buf;
+ char name[8];
+
+ blobmsg_parse_attr(sta_policy, __STA_ATTR_MAX, tb, data);
+
+ cur = tb[STA_ATTR_DISABLED];
+ if (cur && blobmsg_get_bool(cur))
+ return;
+
+ sprintf(name, "%d", vif->sta_idx++);
+
+ sta = calloc_a(sizeof(*sta),
+ &name_buf, strlen(name) + 1);
+ sta->name = strcpy(name_buf, name);
+ sta->config = data;
+ sta->section = section;
+
+ vlist_add(&vif->stations, &sta->node, sta->name);
+}
+
+/* ubus callback network.wireless.status, runs for every interface, encode the station */
+static void
+wireless_station_status(struct wireless_station *sta, struct blob_buf *b)
+{
+ void *i;
+
+ i = blobmsg_open_table(b, NULL);
+ if (sta->section)
+ blobmsg_add_string(b, "section", sta->section);
+ put_container(b, sta->config, "config");
+ blobmsg_close_table(b, i);
+}
+
+/* create a vlan object. Called by config */
+void
+wireless_vlan_create(struct wireless_interface *vif, struct blob_attr *data, const char *section)
+{
+ struct wireless_vlan *vlan;
+ struct blob_attr *tb[__VLAN_ATTR_MAX];
+ struct blob_attr *cur;
+ char *name_buf;
+ char name[8];
+
+ blobmsg_parse_attr(vlan_policy, __VLAN_ATTR_MAX, tb, data);
+
+ cur = tb[VLAN_ATTR_DISABLED];
+ if (cur && blobmsg_get_bool(cur))
+ return;
+
+ sprintf(name, "%d", vif->vlan_idx++);
+
+ vlan = calloc_a(sizeof(*vlan), &name_buf, strlen(name) + 1);
+ vlan->name = strcpy(name_buf, name);
+ vlan->config = data;
+ vlan->section = section;
+
+ vlist_add(&vif->vlans, &vlan->node, vlan->name);
+}
+
+/* ubus callback network.wireless.status, runs for every interface, encode the vlan informations */
+static void
+wireless_vlan_status(struct wireless_vlan *vlan, struct blob_buf *b)
+{
+ void *i;
+
+ i = blobmsg_open_table(b, NULL);
+ if (vlan->section)
+ blobmsg_add_string(b, "section", vlan->section);
+ if (vlan->ifname)
+ blobmsg_add_string(b, "ifname", vlan->ifname);
+ put_container(b, vlan->config, "config");
+ blobmsg_close_table(b, i);
+}
+
+/* create a wireless interface object. Called by config */
+struct wireless_interface* wireless_interface_create(struct wireless_device *wdev, struct blob_attr *data, const char *section)
{
struct wireless_interface *vif;
struct blob_attr *tb[__VIF_ATTR_MAX];
char *name_buf;
char name[8];
- blobmsg_parse(vif_policy, __VIF_ATTR_MAX, tb, blob_data(data), blob_len(data));
+ blobmsg_parse_attr(vif_policy, __VIF_ATTR_MAX, tb, data);
cur = tb[VIF_ATTR_DISABLED];
if (cur && blobmsg_get_bool(cur))
- return;
+ return NULL;
sprintf(name, "%d", wdev->vif_idx++);
vif->section = section;
vif->isolate = false;
+ vlist_init(&vif->vlans, avl_strcmp, vlan_update);
+ vif->vlans.keep_old = true;
+
+ vlist_init(&vif->stations, avl_strcmp, station_update);
+ vif->stations.keep_old = true;
+
vlist_add(&wdev->interfaces, &vif->node, vif->name);
+
+ vif = vlist_find(&wdev->interfaces, name, vif, node);
+ if (!vif)
+ return NULL;
+
+ vif->vlan_idx = vif->sta_idx = 0;
+ vlist_update(&vif->vlans);
+ vlist_update(&vif->stations);
+
+ return vif;
}
+/* ubus callback network.wireless.status, runs for every interface */
static void
wireless_interface_status(struct wireless_interface *iface, struct blob_buf *b)
{
- void *i;
+ struct wireless_vlan *vlan;
+ struct wireless_station *sta;
+ void *i, *j;
i = blobmsg_open_table(b, NULL);
if (iface->section)
if (iface->ifname)
blobmsg_add_string(b, "ifname", iface->ifname);
put_container(b, iface->config, "config");
+ j = blobmsg_open_array(b, "vlans");
+ vlist_for_each_element(&iface->vlans, vlan, node)
+ wireless_vlan_status(vlan, b);
+ blobmsg_close_array(b, j);
+ j = blobmsg_open_array(b, "stations");
+ vlist_for_each_element(&iface->stations, sta, node)
+ wireless_station_status(sta, b);
+ blobmsg_close_array(b, j);
blobmsg_close_table(b, i);
}
+/* ubus callback network.wireless.status */
void
wireless_device_status(struct wireless_device *wdev, struct blob_buf *b)
{
blobmsg_close_table(b, c);
}
+/* ubus callback network.wireless.get_validate */
void
wireless_device_get_validate(struct wireless_device *wdev, struct blob_buf *b)
{
blobmsg_close_table(b, c);
}
+/* ubus callback network.wireless.notify, command = set data, for vif */
static void
wireless_interface_set_data(struct wireless_interface *vif)
{
struct blob_attr *tb[__VIF_DATA_MAX];
struct blob_attr *cur;
- blobmsg_parse(data_policy, __VIF_DATA_MAX, tb,
- blobmsg_data(vif->data), blobmsg_data_len(vif->data));
+ blobmsg_parse_attr(data_policy, __VIF_DATA_MAX, tb, vif->data);
if ((cur = tb[VIF_DATA_IFNAME]))
vif->ifname = blobmsg_data(cur);
}
+/* ubus callback network.wireless.notify, command = set data, for vlan */
+static void
+wireless_vlan_set_data(struct wireless_vlan *vlan)
+{
+ enum {
+ VLAN_DATA_IFNAME,
+ __VLAN_DATA_MAX,
+ };
+ static const struct blobmsg_policy data_policy[__VLAN_DATA_MAX] = {
+ [VLAN_DATA_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
+ };
+ struct blob_attr *tb[__VLAN_DATA_MAX];
+ struct blob_attr *cur;
+
+ blobmsg_parse_attr(data_policy, __VLAN_DATA_MAX, tb, vlan->data);
+
+ if ((cur = tb[VLAN_DATA_IFNAME]))
+ vlan->ifname = blobmsg_data(cur);
+}
+
+/* ubus callback network.wireless.notify, command = process add */
static int
wireless_device_add_process(struct wireless_device *wdev, struct blob_attr *data)
{
PROC_ATTR_PID,
PROC_ATTR_EXE,
PROC_ATTR_REQUIRED,
+ PROC_ATTR_KEEP,
__PROC_ATTR_MAX
};
static const struct blobmsg_policy proc_policy[__PROC_ATTR_MAX] = {
[PROC_ATTR_PID] = { .name = "pid", .type = BLOBMSG_TYPE_INT32 },
[PROC_ATTR_EXE] = { .name = "exe", .type = BLOBMSG_TYPE_STRING },
[PROC_ATTR_REQUIRED] = { .name = "required", .type = BLOBMSG_TYPE_BOOL },
+ [PROC_ATTR_KEEP] = { .name = "keep", .type = BLOBMSG_TYPE_BOOL },
};
struct blob_attr *tb[__PROC_ATTR_MAX];
struct wireless_process *proc;
if (!data)
return UBUS_STATUS_INVALID_ARGUMENT;
- blobmsg_parse(proc_policy, __PROC_ATTR_MAX, tb, blobmsg_data(data), blobmsg_data_len(data));
+ blobmsg_parse_attr(proc_policy, __PROC_ATTR_MAX, tb, data);
if (!tb[PROC_ATTR_PID] || !tb[PROC_ATTR_EXE])
return UBUS_STATUS_INVALID_ARGUMENT;
if (tb[PROC_ATTR_REQUIRED])
proc->required = blobmsg_get_bool(tb[PROC_ATTR_REQUIRED]);
- D(WIRELESS, "Wireless device '%s' add pid %d\n", wdev->name, proc->pid);
+ if (tb[PROC_ATTR_KEEP])
+ proc->keep = blobmsg_get_bool(tb[PROC_ATTR_KEEP]);
+
+ D(WIRELESS, "Wireless device '%s' add pid %d", wdev->name, proc->pid);
list_add(&proc->list, &wdev->script_proc);
uloop_timeout_set(&wdev->script_check, 0);
return 0;
}
+/* ubus callback network.wireless.notify, command = process kill all */
static int
wireless_device_process_kill_all(struct wireless_device *wdev, struct blob_attr *data,
struct ubus_request_data *req)
bool immediate = false;
int signal = SIGTERM;
- blobmsg_parse(kill_policy, __KILL_ATTR_MAX, tb, blobmsg_data(data), blobmsg_data_len(data));
+ blobmsg_parse_attr(kill_policy, __KILL_ATTR_MAX, tb, data);
if ((cur = tb[KILL_ATTR_SIGNAL]))
signal = blobmsg_get_u32(cur);
return 0;
}
+/* ubus callback network.wireless.notify, command = set_retry */
static int
wireless_device_set_retry(struct wireless_device *wdev, struct blob_attr *data)
{
};
struct blob_attr *val;
- blobmsg_parse(&retry_policy, 1, &val, blobmsg_data(data), blobmsg_data_len(data));
- if (!val)
- return UBUS_STATUS_INVALID_ARGUMENT;
-
- wdev->retry = blobmsg_get_u32(val);
+ blobmsg_parse_attr(&retry_policy, 1, &val, data);
+ if (val)
+ wdev->retry = blobmsg_get_u32(val);
+ else
+ wdev->retry = WIRELESS_SETUP_RETRY;
+ __wireless_device_set_up(wdev, 0);
+ netifd_log_message(L_NOTICE, "Wireless device '%s' set retry=%d\n", wdev->name, wdev->retry);
return 0;
}
NOTIFY_CMD_SET_RETRY = 4,
};
+/* ubus callback network.wireless.notify */
int
wireless_device_notify(struct wireless_device *wdev, struct blob_attr *data,
struct ubus_request_data *req)
enum {
NOTIFY_ATTR_COMMAND,
NOTIFY_ATTR_VIF,
+ NOTIFY_ATTR_VLAN,
NOTIFY_ATTR_DATA,
__NOTIFY_MAX,
};
static const struct blobmsg_policy notify_policy[__NOTIFY_MAX] = {
[NOTIFY_ATTR_COMMAND] = { .name = "command", .type = BLOBMSG_TYPE_INT32 },
[NOTIFY_ATTR_VIF] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
+ [NOTIFY_ATTR_VLAN] = { .name = "vlan", .type = BLOBMSG_TYPE_STRING },
[NOTIFY_ATTR_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
};
struct wireless_interface *vif = NULL;
+ struct wireless_vlan *vlan = NULL;
struct blob_attr *tb[__NOTIFY_MAX];
struct blob_attr *cur, **pdata;
- blobmsg_parse(notify_policy, __NOTIFY_MAX, tb, blob_data(data), blob_len(data));
+ blobmsg_parse_attr(notify_policy, __NOTIFY_MAX, tb, data);
if (!tb[NOTIFY_ATTR_COMMAND])
return UBUS_STATUS_INVALID_ARGUMENT;
return UBUS_STATUS_NOT_FOUND;
}
+ if ((cur = tb[NOTIFY_ATTR_VLAN]) != NULL) {
+ if (!vif)
+ return UBUS_STATUS_NOT_FOUND;
+ vlan = vlist_find(&vif->vlans, blobmsg_data(cur), vlan, node);
+ if (!vlan)
+ return UBUS_STATUS_NOT_FOUND;
+ }
+
cur = tb[NOTIFY_ATTR_DATA];
if (!cur)
return UBUS_STATUS_INVALID_ARGUMENT;
switch (blobmsg_get_u32(tb[NOTIFY_ATTR_COMMAND])) {
case NOTIFY_CMD_UP:
- if (vif)
+ if (vif || vlan)
return UBUS_STATUS_INVALID_ARGUMENT;
if (wdev->state != IFS_SETUP)
wireless_device_mark_up(wdev);
break;
case NOTIFY_CMD_SET_DATA:
- if (vif)
+ if (vlan)
+ pdata = &vlan->data;
+ else if (vif)
pdata = &vif->data;
else
pdata = &wdev->data;
- if (*pdata)
- return UBUS_STATUS_INVALID_ARGUMENT;
-
+ free(*pdata);
*pdata = blob_memdup(cur);
- if (vif)
+ if (vlan)
+ wireless_vlan_set_data(vlan);
+ else if (vif)
wireless_interface_set_data(vif);
+ wdev_prepare_prev_config(wdev);
break;
case NOTIFY_CMD_PROCESS_ADD:
return wireless_device_add_process(wdev, cur);
return 0;
}
-void
-wireless_start_pending(void)
+static void
+wdev_check_network_enabled(struct wireless_device *wdev)
+{
+ struct wireless_interface *vif;
+ struct interface *iface;
+ struct blob_attr *cur;
+ size_t rem;
+
+ vlist_for_each_element(&wdev->interfaces, vif, node) {
+ int enabled = -1;
+
+ blobmsg_for_each_attr(cur, vif->network, rem) {
+ iface = vlist_find(&interfaces, blobmsg_get_string(cur), iface, node);
+ if (!iface)
+ continue;
+
+ if (iface->autostart) {
+ enabled = 1;
+ break;
+ }
+ if (enabled != 1)
+ enabled = 0;
+ }
+
+ if (vif->disabled == !enabled)
+ continue;
+
+ vif->disabled = !enabled;
+ wdev->config_update = true;
+ }
+}
+
+static void
+__wireless_start_pending(struct uloop_timeout *t)
{
struct wireless_device *wdev;
- vlist_for_each_element(&wireless_devices, wdev, node)
+ vlist_for_each_element(&wireless_devices, wdev, node) {
+ wdev_check_network_enabled(wdev);
+ if (wdev->config_update)
+ wdev_set_config_state(wdev, IFC_RELOAD);
__wireless_device_set_up(wdev, 0);
+ }
+}
+
+void wireless_start_pending(int timeout)
+{
+ static struct uloop_timeout timer = {
+ .cb = __wireless_start_pending
+ };
+
+ if (timeout) {
+ uloop_timeout_set(&timer, timeout);
+ return;
+ }
+
+ uloop_timeout_cancel(&timer);
+ timer.cb(&timer);
+}
+
+void wireless_check_network_enabled(void)
+{
+ struct wireless_device *wdev;
+
+ vlist_for_each_element(&wireless_devices, wdev, node) {
+ wdev_check_network_enabled(wdev);
+
+ if (wdev->config_update)
+ wireless_start_pending(1000);
+ }
+}
+
+void wireless_device_hotplug_event(const char *name, bool add)
+{
+ struct wireless_interface *vif;
+ struct wireless_device *wdev;
+ const char *s;
+ size_t len;
+
+ s = strstr(name, ".sta");
+ if (s) {
+ if (strchr(s + 4, '.'))
+ return;
+
+ len = s - name;
+ } else if (!device_find(name)) {
+ len = strlen(name);
+ } else {
+ return;
+ }
+
+ vlist_for_each_element(&wireless_devices, wdev, node) {
+ vlist_for_each_element(&wdev->interfaces, vif, node) {
+ if (!vif->ifname)
+ continue;
+
+ if (strlen(vif->ifname) != len ||
+ strncmp(vif->ifname, name, len) != 0)
+ continue;
+
+ wireless_interface_handle_link(vif, name, add);
+ }
+ }
}
projects / project / netifd.git / blobdiff