VIF_ATTR_NETWORK,
VIF_ATTR_ISOLATE,
VIF_ATTR_MODE,
+ VIF_ATTR_PROXYARP,
+ VIF_ATTR_MCAST_TO_UCAST,
__VIF_ATTR_MAX,
};
[VIF_ATTR_NETWORK] = { .name = "network", .type = BLOBMSG_TYPE_ARRAY },
[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 = {
VLAN_ATTR_DISABLED,
VLAN_ATTR_NETWORK,
VLAN_ATTR_ISOLATE,
+ VLAN_ATTR_MCAST_TO_UCAST,
__VLAN_ATTR_MAX,
};
[VLAN_ATTR_DISABLED] = { .name = "disabled", .type = BLOBMSG_TYPE_BOOL },
[VLAN_ATTR_NETWORK] = { .name = "network", .type = BLOBMSG_TYPE_ARRAY },
[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 = {
struct device *dev = NULL, *orig_dev;
struct blob_attr *cur;
const char *network;
- int rem;
+ size_t rem;
if (!networks)
return;
}
}
-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;
+ size_t rem;
if (!vif->network || !vif->ifname)
return;
+ if (!ifname)
+ ifname = vif->ifname;
+
if (up) {
- struct device *dev = device_get(vif->ifname, 2);
- if (dev) {
+ struct device *dev = __device_get(ifname, 2, false);
+
+ if (dev && !strcmp(ifname, vif->ifname)) {
dev->wireless_isolate = vif->isolate;
+ dev->wireless_proxyarp = vif->proxyarp;
dev->wireless = true;
dev->wireless_ap = vif->ap_mode;
+ wireless_device_set_mcast_to_unicast(dev, vif->multicast_to_unicast);
+ dev->bpdu_filter = dev->wireless_ap;
}
}
if (!iface)
continue;
- interface_handle_link(iface, vif->ifname, NULL, up, true);
+ interface_handle_link(iface, ifname, NULL, up, true);
}
}
struct interface *iface;
struct blob_attr *cur;
const char *network;
- int rem;
+ size_t rem;
if (!vlan->network || !vlan->ifname)
return;
dev->wireless_isolate = vlan->isolate;
dev->wireless = true;
dev->wireless_ap = true;
+ dev->bpdu_filter = true;
+ wireless_device_set_mcast_to_unicast(dev, vlan->multicast_to_unicast);
}
}
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);
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;
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->vlans, vlan, node)
wireless_vlan_handle_link(vlan, false);
vlist_for_each_element(&wdev->interfaces, vif, node)
- wireless_interface_handle_link(vif, false);
+ wireless_interface_handle_link(vif, NULL, false);
wireless_process_kill_all(wdev, SIGTERM, true);
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);
+ wireless_interface_handle_link(vif, NULL, true);
vlist_for_each_element(&wdev->vlans, vlan, node)
wireless_vlan_handle_link(vlan, true);
}
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;
free(wdev->config);
wdev->config = blob_memdup(new_config);
wdev->disabled = disabled;
- wdev->retry_setup_failed = false;
wdev_set_config_state(wdev, IFC_RELOAD);
}
if ((cur = tb[VIF_ATTR_NETWORK]))
vif->network = cur;
+ cur = tb[VIF_ATTR_MODE];
+ vif->ap_mode = cur && !strcmp(blobmsg_get_string(cur), "ap");
+
cur = tb[VIF_ATTR_ISOLATE];
- if (cur)
- vif->isolate = blobmsg_get_bool(cur);
+ vif->isolate = vif->ap_mode && cur && blobmsg_get_bool(cur);
- cur = tb[VIF_ATTR_MODE];
- if (cur)
- vif->ap_mode = !strcmp(blobmsg_get_string(cur), "ap");
+ 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;
}
/* vlist update call for wireless interface list */
}
D(WIRELESS, "Update wireless interface %s on device %s\n", vif_new->name, wdev->name);
- wireless_interface_handle_link(vif_old, false);
+ 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) {
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);
+ wireless_interface_handle_link(vif_old, NULL, false);
free((void *) vif_old->section);
free(vif_old->config);
free(vif_old);
cur = tb[VLAN_ATTR_ISOLATE];
if (cur)
vlan->isolate = 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 */
if (cur && blobmsg_get_bool(cur))
return;
- sprintf(name, "%d", wdev->vlan_idx++);
+ sprintf(name, "%d", wdev->sta_idx++);
sta = calloc_a(sizeof(*sta),
&name_buf, strlen(name) + 1,
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);
+ 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;
}
vlist_for_each_element(&wireless_devices, wdev, node)
__wireless_device_set_up(wdev, 0);
}
+
+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);
+ }
+ }
+}