proto-shell: Model config parameter "no-proto-task" as a proto flag

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index 4e91e18..5d3db9f 100644 (file)
--- a/config.c
+++ b/config.c
@@ -78,7 +78,6 @@ 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;
 
        disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
@@ -105,7 +104,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,27 +117,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;
-
-       if (iface->device_config && dev->default_config)
-               device_set_config(dev, dev->type, b.head);
        return;
+
 error_free_config:
        free(config);
 error:
@@ -218,6 +198,7 @@ config_init_devices(void)
                        if (!dev)
                                continue;
 
+                       dev->current_config = true;
                        device_apply_config(dev, dev->type, b.head);
                }
                dev->default_config = false;
@@ -325,6 +306,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