X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=f3e5f9d04dda5d12069cce19666557352d8feb68;hp=c51e37921859ee4a27f7698fe0b982defc47e751;hb=3b8673edadc8ce6d1d90c12e6b8e57eeb291c521;hpb=a2bc078dd3187752d18163266ccbf6c40803d5c9

diff --git a/config.c b/config.c
index c51e379..f3e5f9d 100644
--- a/config.c
+++ b/config.c
@@ -20,6 +20,7 @@
 #include "netifd.h"
 #include "interface.h"
 #include "interface-ip.h"
+#include "iprule.h"
 #include "proto.h"
 #include "config.h"
 
@@ -246,6 +247,18 @@ config_parse_route(struct uci_section *s, bool v6)
 }
 
 static void
+config_parse_rule(struct uci_section *s, bool v6)
+{
+	void *rule;
+
+	blob_buf_init(&b, 0);
+	rule = blobmsg_open_array(&b, "rule");
+	uci_to_blob(&b, s, &rule_attr_list);
+	blobmsg_close_array(&b, rule);
+	iprule_add(blob_data(b.head), v6);
+}
+
+static void
 config_init_devices(void)
 {
 	struct uci_element *e;
@@ -435,6 +448,38 @@ config_init_routes(void)
 		interface_ip_update_complete(&iface->config_ip);
 }
 
+static void
+config_init_rules(void)
+{
+	struct uci_element *e;
+
+	iprule_update_start();
+
+	uci_foreach_element(&uci_network->sections, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		if (!strcmp(s->type, "rule"))
+			config_parse_rule(s, false);
+		else if (!strcmp(s->type, "rule6"))
+			config_parse_rule(s, true);
+	}
+
+	iprule_update_complete();
+}
+
+static void
+config_init_globals(void)
+{
+	struct uci_section *globals = uci_lookup_section(
+			uci_ctx, uci_network, "globals");
+	if (!globals)
+		return;
+
+	const char *ula_prefix = uci_lookup_option_string(
+			uci_ctx, globals, "ula_prefix");
+	interface_ip_set_ula_prefix(ula_prefix);
+}
+
 void
 config_init_all(void)
 {
@@ -452,13 +497,16 @@ config_init_all(void)
 	config_init_devices();
 	config_init_interfaces();
 	config_init_routes();
+	config_init_rules();
+	config_init_globals();
 
 	config_init = false;
 	device_unlock();
 
 	device_reset_old();
 	device_init_pending();
-	device_free_unused(NULL);
 	vlist_flush(&interfaces);
+	device_free_unused(NULL);
+	interface_refresh_assignments(false);
 	interface_start_pending();
 }