netifd: propagate error code on netifd_reload()

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index 7319b3c..2454e9b 100644 (file)
--- a/config.c
+++ b/config.c
@@ -53,18 +53,18 @@ config_section_idx(struct uci_section *s)
 }
 
 static int
-config_parse_bridge_interface(struct uci_section *s)
+config_parse_bridge_interface(struct uci_section *s, struct device_type *devtype)
 {
        char *name;
 
-       name = alloca(strlen(s->e.name) + 4);
-       sprintf(name, "br-%s", s->e.name);
+       name = alloca(strlen(s->e.name) + strlen(devtype->name_prefix) + 2);
+       sprintf(name, "%s-%s", devtype->name_prefix, s->e.name);
        blobmsg_add_string(&b, "name", name);
 
-       uci_to_blob(&b, s, bridge_device_type.config_params);
-       if (!device_create(name, &bridge_device_type, b.head)) {
-               D(INTERFACE, "Failed to create bridge for interface '%s'\n", s->e.name);
-               return -EINVAL;
+       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",
+                       devtype->name, s->e.name);
        }
 
        blob_buf_init(&b, 0);
@@ -78,8 +78,8 @@ config_parse_interface(struct uci_section *s, bool alias)
        struct interface *iface;
        const char *type = NULL, *disabled;
        struct blob_attr *config;
-       struct device *dev;
        bool bridge = false;
+       struct device_type *devtype = NULL;
 
        disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
        if (disabled && !strcmp(disabled, "1"))
@@ -89,8 +89,12 @@ config_parse_interface(struct uci_section *s, bool alias)
 
        if (!alias)
                type = uci_lookup_option_string(uci_ctx, s, "type");
-       if (type && !strcmp(type, "bridge")) {
-               if (config_parse_bridge_interface(s))
+
+       if (type)
+               devtype = device_type_get(type);
+
+       if (devtype && devtype->bridge_capability) {
+               if (config_parse_bridge_interface(s, devtype))
                        return;
 
                bridge = true;
@@ -105,7 +109,7 @@ config_parse_interface(struct uci_section *s, bool alias)
        if (iface->proto_handler && iface->proto_handler->config_params)
                uci_to_blob(&b, s, iface->proto_handler->config_params);
 
-       if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params) > 1)
+       if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params))
                iface->device_config = true;
 
        config = blob_memdup(b.head);
@@ -118,26 +122,8 @@ config_parse_interface(struct uci_section *s, bool alias)
        } else {
                interface_add(iface, config);
        }
-
-       /*
-        * need to look up the interface name again, in case of config update,
-        * the pointer will have changed
-        */
-       iface = vlist_find(&interfaces, s->e.name, iface, node);
-       if (!iface)
-               return;
-
-       dev = iface->main_dev.dev;
-       if (!dev || !dev->default_config)
-               return;
-
-       blob_buf_init(&b, 0);
-       uci_to_blob(&b, s, dev->type->config_params);
-       if (blob_len(b.head) == 0)
-               return;
-
-       device_set_config(dev, dev->type, b.head);
        return;
+
 error_free_config:
        free(config);
 error:
@@ -176,7 +162,7 @@ config_init_devices(void)
        uci_foreach_element(&uci_network->sections, e) {
                const struct uci_blob_param_list *params = NULL;
                struct uci_section *s = uci_to_section(e);
-               const struct device_type *devtype = NULL;
+               struct device_type *devtype = NULL;
                struct device *dev;
                const char *type, *name;
 
@@ -188,18 +174,8 @@ config_init_devices(void)
                        continue;
 
                type = uci_lookup_option_string(uci_ctx, s, "type");
-               if (type) {
-                       if (!strcmp(type, "8021ad"))
-                               devtype = &vlandev_device_type;
-                       else if (!strcmp(type, "8021q"))
-                               devtype = &vlandev_device_type;
-                       else if (!strcmp(type, "bridge"))
-                               devtype = &bridge_device_type;
-                       else if (!strcmp(type, "macvlan"))
-                               devtype = &macvlan_device_type;
-                       else if (!strcmp(type, "tunnel"))
-                               devtype = &tunnel_device_type;
-               }
+               if (type)
+                       devtype = device_type_get(type);
 
                if (devtype)
                        params = devtype->config_params;
@@ -217,7 +193,8 @@ config_init_devices(void)
                        if (!dev)
                                continue;
 
-                       device_apply_config(dev, dev->type, blob_memdup(b.head));
+                       dev->current_config = true;
+                       device_apply_config(dev, dev->type, b.head);
                }
                dev->default_config = false;
        }
@@ -324,6 +301,12 @@ config_init_globals(void)
        const char *ula_prefix = uci_lookup_option_string(
                        uci_ctx, globals, "ula_prefix");
        interface_ip_set_ula_prefix(ula_prefix);
+
+       const char *default_ps = uci_lookup_option_string(
+                       uci_ctx, globals, "default_ps");
+
+       if (default_ps)
+               device_set_default_ps(strcmp(default_ps, "1") ? false : true);
 }
 
 static void
@@ -410,16 +393,20 @@ config_init_wireless(void)
                vlist_flush(&wdev->interfaces);
 }
 
-void
+int
 config_init_all(void)
 {
+       int ret = 0;
+
        uci_network = config_init_package("network");
        if (!uci_network) {
                fprintf(stderr, "Failed to load network config\n");
-               return;
+               return -1;
        }
 
        uci_wireless = config_init_package("wireless");
+       if (!uci_wireless)
+               ret = -1;
 
        vlist_update(&interfaces);
        config_init = true;
@@ -443,4 +430,6 @@ config_init_all(void)
        interface_refresh_assignments(false);
        interface_start_pending();
        wireless_start_pending();
+
+       return ret;
 }