X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=interface.c;h=ddbdca9122a9ce1e1b00b3a70d442cb53d4260b8;hb=987bdc77deecb928d86b9d710cc3bcfa5b3d80eb;hp=76f8c7038ac6b1c8c3bb86ac13705f002d9d22b8;hpb=da279866a33682e590428b740b4564a4b2e6f780;p=project%2Fnetifd.git

diff --git a/interface.c b/interface.c
index 76f8c70..ddbdca9 100644
--- a/interface.c
+++ b/interface.c
@@ -63,12 +63,12 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_IP6CLASS] = { .name = "ip6class", .type = BLOBMSG_TYPE_ARRAY },
 };
 
-static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
+static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_IP6CLASS] = { .type = BLOBMSG_TYPE_STRING },
 };
 
-const struct config_param_list interface_attr_list = {
+const struct uci_blob_param_list interface_attr_list = {
 	.n_params = IFACE_ATTR_MAX,
 	.params = iface_attrs,
 	.info = iface_attr_info,
@@ -588,8 +588,12 @@ interface_init(struct interface *iface, const char *name,
 	}
 
 	// Set a default exteranl routing table for IPv6 to do source-based-filtering
+	struct interface *iface_old = vlist_find(&interfaces, name, iface_old, node);
+	if (iface_old && iface_old->ip6table > 1000 && iface_old->ip6table < 2000)
+		iface->ip6table = iface_old->ip6table;
+	else
+		iface->ip6table = 1000 + ++interface_serial;
 
-	iface->ip6table = 1000 + ++interface_serial;
 	if ((cur = tb[IFACE_ATTR_IP6TABLE])) {
 		if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip6table))
 			DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
@@ -671,6 +675,9 @@ interface_set_main_dev(struct interface *iface, struct device *dev)
 		interface_set_l3_dev(iface, dev);
 
 	device_add_user(&iface->main_dev, dev);
+	if (!dev)
+		return;
+
 	if (claimed)
 		device_claim(&iface->l3_dev);
 
@@ -829,8 +836,8 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 	if (!if_old->proto_handler->config_params)
 		D(INTERFACE, "No config parameters for interface '%s'\n",
 		  if_old->name);
-	else if (!config_check_equal(if_old->config, if_new->config,
-				     if_old->proto_handler->config_params))
+	else if (!uci_blob_check_equal(if_old->config, if_new->config,
+				       if_old->proto_handler->config_params))
 		reload = true;
 
 #define UPDATE(field, __var) ({						\
@@ -854,6 +861,8 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 
 	UPDATE(metric, reload_ip);
 	UPDATE(proto_ip.no_defaultroute, reload_ip);
+	UPDATE(ip4table, reload_ip);
+	UPDATE(ip6table, reload_ip);
 	interface_merge_assignment_data(if_old, if_new);
 
 #undef UPDATE
@@ -868,9 +877,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 
 	if (reload_ip) {
 		interface_ip_set_enabled(&if_old->config_ip, false);
-		interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
 		interface_ip_set_enabled(&if_old->proto_ip, false);
 		interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
+		interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
 	}
 
 	interface_write_resolv_conf();