ubus: display the point-to-point IPv4 address

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index 0d965d3..21791af 100644 (file)
--- a/config.c
+++ b/config.c
@@ -289,6 +289,18 @@ config_init_rules(void)
 
        iprule_update_complete();
 }
+static int
+config_parse_global_ps_val(struct uci_section *globals, const char *option)
+{
+       const char *val = uci_lookup_option_string(
+                       uci_ctx, globals, option);
+       int ret = 0;
+
+       if (val)
+               ret = strtol(val, 0, 10);
+
+       return ret;
+}
 
 static void
 config_init_globals(void)
@@ -306,7 +318,10 @@ config_init_globals(void)
                        uci_ctx, globals, "default_ps");
 
        if (default_ps)
-               device_set_default_ps(strcmp(default_ps, "1") ? false : true);
+               device_set_default_ps(strcmp(default_ps, "1") ? false : true,
+                       config_parse_global_ps_val(globals, "default_xps_val"),
+                       config_parse_global_ps_val(globals, "default_rps_val"),
+                       config_parse_global_ps_val(globals, "default_rps_flow_cnt"));
 }
 
 static void
@@ -393,16 +408,27 @@ config_init_wireless(void)
                vlist_flush(&wdev->interfaces);
 }
 
-void
+int
 config_init_all(void)
 {
+       int ret = 0;
+       char *err;
+
        uci_network = config_init_package("network");
        if (!uci_network) {
-               fprintf(stderr, "Failed to load network config\n");
-               return;
+               uci_get_errorstr(uci_ctx, &err, NULL);
+               netifd_log_message(L_CRIT, "Failed to load network config (%s)\n", err);
+               free(err);
+               return -1;
        }
 
        uci_wireless = config_init_package("wireless");
+       if (!uci_wireless && uci_ctx->err != UCI_ERR_NOTFOUND) {
+               uci_get_errorstr(uci_ctx, &err, NULL);
+               netifd_log_message(L_CRIT, "Failed to load wireless config (%s)\n", err);
+               free(err);
+               ret = -1;
+       }
 
        vlist_update(&interfaces);
        config_init = true;
@@ -426,4 +452,6 @@ config_init_all(void)
        interface_refresh_assignments(false);
        interface_start_pending();
        wireless_start_pending();
+
+       return ret;
 }