CMake: bump the minimum required CMake version to 3.5
[project/netifd.git] / config.c
index 1f4560f204975922c1c97443df3dcadf384fd99f..a7f9c0b64a44567ecb11c32aa3b059883cc507a7 100644 (file)
--- a/config.c
+++ b/config.c
@@ -103,14 +103,21 @@ config_fixup_bridge_var(struct uci_section *s, const char *name, const char *val
  */
 static void config_fixup_bridge_ports(struct uci_section *s)
 {
-       const char *ifname;
+       struct uci_ptr ptr = {
+               .p = s->package,
+               .s = s,
+               .option = "ifname",
+       };
 
        if (uci_lookup_option(uci_ctx, s, "ports"))
                return;
 
-       ifname = uci_lookup_option_string(uci_ctx, s, "ifname");
-       if (ifname)
-               config_fixup_bridge_var(s, "ports", ifname);
+       uci_lookup_ptr(uci_ctx, &ptr, NULL, false);
+       if (!ptr.o)
+               return;
+
+       ptr.value = "ports";
+       uci_rename(uci_ctx, &ptr);
 }
 
 static void
@@ -139,7 +146,7 @@ config_parse_bridge_interface(struct uci_section *s, struct device_type *devtype
        config_fixup_bridge_vlan_filtering(s, name);
        uci_to_blob(&b, s, devtype->config_params);
        if (!device_create(name, devtype, b.head)) {
-               D(INTERFACE, "Failed to create '%s' device for interface '%s'\n",
+               D(INTERFACE, "Failed to create '%s' device for interface '%s'",
                        devtype->name, s->e.name);
        }
 
@@ -330,7 +337,7 @@ config_parse_vlan(struct device *dev, struct uci_section *s)
        char *name_buf;
        int name_len = 0;
        int n_ports = 0;
-       int rem;
+       size_t rem;
 
        val = uci_lookup_option_string(uci_ctx, s, "vlan");
        if (!val)
@@ -550,8 +557,8 @@ config_parse_wireless_device(struct uci_section *s)
        wireless_device_create(drv, s->e.name, b.head);
 }
 
-static struct wireless_interface*
-config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
+static void
+config_parse_wireless_vlan(struct wireless_interface *vif, struct uci_section *s)
 {
        char *name;
 
@@ -559,12 +566,12 @@ config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section
        sprintf(name, "@%s[%d]", s->type, config_section_idx(s));
 
        blob_buf_init(&b, 0);
-       uci_to_blob(&b, s, wdev->drv->interface.config);
-       return wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name);
+       uci_to_blob(&b, s, vif->wdev->drv->vlan.config);
+       wireless_vlan_create(vif, b.head, s->anonymous ? name : s->e.name);
 }
 
 static void
-config_parse_wireless_vlan(struct wireless_device *wdev, char *vif, struct uci_section *s)
+config_parse_wireless_station(struct wireless_interface *vif, struct uci_section *s)
 {
        char *name;
 
@@ -572,21 +579,62 @@ config_parse_wireless_vlan(struct wireless_device *wdev, char *vif, struct uci_s
        sprintf(name, "@%s[%d]", s->type, config_section_idx(s));
 
        blob_buf_init(&b, 0);
-       uci_to_blob(&b, s, wdev->drv->vlan.config);
-       wireless_vlan_create(wdev, vif, b.head, s->anonymous ? name : s->e.name);
+       uci_to_blob(&b, s, vif->wdev->drv->station.config);
+       wireless_station_create(vif, b.head, s->anonymous ? name : s->e.name);
 }
 
 static void
-config_parse_wireless_station(struct wireless_device *wdev, char *vif, struct uci_section *s)
+config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s)
 {
+       struct wireless_interface *vif;
+       struct uci_element *f;
        char *name;
 
        name = alloca(strlen(s->type) + 16);
        sprintf(name, "@%s[%d]", s->type, config_section_idx(s));
 
        blob_buf_init(&b, 0);
-       uci_to_blob(&b, s, wdev->drv->station.config);
-       wireless_station_create(wdev, vif, b.head, s->anonymous ? name : s->e.name);
+       uci_to_blob(&b, s, wdev->drv->interface.config);
+       vif = wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name);
+       if (!vif)
+               return;
+
+       vif->vlan_idx = vif->sta_idx = 0;
+       vlist_update(&vif->vlans);
+       vlist_update(&vif->stations);
+
+       if (s->anonymous)
+               goto out;
+
+       uci_foreach_element(&uci_wireless->sections, f) {
+               struct uci_section *cur = uci_to_section(f);
+               const char *vif_name;
+
+               if (strcmp(cur->type, "wifi-vlan") != 0)
+                       continue;
+
+               vif_name = uci_lookup_option_string(uci_ctx, cur, "iface");
+               if (vif_name && strcmp(s->e.name, vif_name))
+                       continue;
+               config_parse_wireless_vlan(vif, cur);
+       }
+
+       uci_foreach_element(&uci_wireless->sections, f) {
+               struct uci_section *cur = uci_to_section(f);
+               const char *vif_name;
+
+               if (strcmp(cur->type, "wifi-station") != 0)
+                       continue;
+
+               vif_name = uci_lookup_option_string(uci_ctx, cur, "iface");
+               if (vif_name && strcmp(s->e.name, vif_name))
+                       continue;
+               config_parse_wireless_station(vif, cur);
+       }
+
+out:
+       vlist_flush(&vif->vlans);
+       vlist_flush(&vif->stations);
 }
 
 static void
@@ -597,7 +645,7 @@ config_init_wireless(void)
        const char *dev_name;
 
        if (!uci_wireless) {
-               DPRINTF("No wireless configuration found\n");
+               D(WIRELESS, "No wireless configuration found");
                return;
        }
 
@@ -616,16 +664,10 @@ config_init_wireless(void)
        vlist_for_each_element(&wireless_devices, wdev, node) {
                wdev->vif_idx = 0;
                vlist_update(&wdev->interfaces);
-               wdev->vlan_idx = 0;
-               vlist_update(&wdev->vlans);
-               wdev->sta_idx = 0;
-               vlist_update(&wdev->stations);
        }
 
        uci_foreach_element(&uci_wireless->sections, e) {
                struct uci_section *s = uci_to_section(e);
-               struct wireless_interface *vif;
-               struct uci_element *f;
 
                if (strcmp(s->type, "wifi-iface") != 0)
                        continue;
@@ -636,46 +678,15 @@ config_init_wireless(void)
 
                wdev = vlist_find(&wireless_devices, dev_name, wdev, node);
                if (!wdev) {
-                       DPRINTF("device %s not found!\n", dev_name);
+                       D(WIRELESS, "device %s not found!", dev_name);
                        continue;
                }
 
-               vif = config_parse_wireless_interface(wdev, s);
-
-               if (!vif || s->anonymous)
-                       continue;
-               uci_foreach_element(&uci_wireless->sections, f) {
-                       struct uci_section *s = uci_to_section(f);
-                       const char *vif_name;
-
-                       if (strcmp(s->type, "wifi-vlan") != 0)
-                               continue;
-
-                       vif_name = uci_lookup_option_string(uci_ctx, s, "iface");
-                       if (vif_name && strcmp(e->name, vif_name))
-                               continue;
-                       config_parse_wireless_vlan(wdev, vif->name, s);
-               }
-
-               uci_foreach_element(&uci_wireless->sections, f) {
-                       struct uci_section *s = uci_to_section(f);
-                       const char *vif_name;
-
-                       if (strcmp(s->type, "wifi-station") != 0)
-                               continue;
-
-                       vif_name = uci_lookup_option_string(uci_ctx, s, "iface");
-                       if (vif_name && strcmp(e->name, vif_name))
-                               continue;
-                       config_parse_wireless_station(wdev, vif->name, s);
-               }
+               config_parse_wireless_interface(wdev, s);
        }
 
-       vlist_for_each_element(&wireless_devices, wdev, node) {
+       vlist_for_each_element(&wireless_devices, wdev, node)
                vlist_flush(&wdev->interfaces);
-               vlist_flush(&wdev->vlans);
-               vlist_flush(&wdev->stations);
-       }
 }
 
 
@@ -708,6 +719,42 @@ struct ether_addr *config_get_default_macaddr(const char *ifname)
        return ether_aton(blobmsg_get_string(cur));
 }
 
+int config_get_default_gro(const char *ifname)
+{
+       struct blob_attr *cur;
+
+       if (!board_netdevs)
+               return -1;
+
+       cur = config_find_blobmsg_attr(board_netdevs, ifname, BLOBMSG_TYPE_TABLE);
+       if (!cur)
+               return -1;
+
+       cur = config_find_blobmsg_attr(cur, "gro", BLOBMSG_TYPE_BOOL);
+       if (!cur)
+               return -1;
+
+       return blobmsg_get_bool(cur);
+}
+
+const char *config_get_default_conduit(const char *ifname)
+{
+       struct blob_attr *cur;
+
+       if (!board_netdevs)
+               return NULL;
+
+       cur = config_find_blobmsg_attr(board_netdevs, ifname, BLOBMSG_TYPE_TABLE);
+       if (!cur)
+               return NULL;
+
+       cur = config_find_blobmsg_attr(cur, "conduit", BLOBMSG_TYPE_STRING);
+       if (!cur)
+               return NULL;
+
+       return blobmsg_get_string(cur);
+}
+
 static void
 config_init_board(void)
 {
@@ -721,7 +768,7 @@ config_init_board(void)
        free(board_netdevs);
        board_netdevs = NULL;
 
-       cur = config_find_blobmsg_attr(b.head, "network-device",
+       cur = config_find_blobmsg_attr(b.head, "network_device",
                                       BLOBMSG_TYPE_TABLE);
        if (!cur)
                return;
@@ -755,7 +802,6 @@ config_init_all(void)
 
        vlist_update(&interfaces);
        config_init = true;
-       device_lock();
 
        device_reset_config();
        config_init_devices(true);
@@ -768,15 +814,13 @@ config_init_all(void)
        config_init_wireless();
 
        config_init = false;
-       device_unlock();
 
        device_reset_old();
        device_init_pending();
        vlist_flush(&interfaces);
-       device_free_unused(NULL);
        interface_refresh_assignments(false);
        interface_start_pending();
-       wireless_start_pending();
+       wireless_start_pending(0);
 
        return ret;
 }