X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=7f10120f878617900ef87f5ae576b8ce343684b4;hp=93e8723be216b9408144970885e7b59f981f2b93;hb=73a32ab092ae32ec97e20b61512998c8411b8bd5;hpb=05c0ded29cf9dd7716528e61029886550ba1f7ab

diff --git a/interface-ip.c b/interface-ip.c
index 93e8723..7f10120 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -124,28 +124,51 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	struct interface_ip_settings *ip;
 	struct interface *iface;
 	struct device *dev;
-	struct device_addr *addr;
+	struct device_addr *a_new = NULL, *a_old = NULL;
 	bool keep = false;
 
 	ip = container_of(tree, struct interface_ip_settings, addr);
 	iface = ip->iface;
 	dev = iface->l3_dev->dev;
 
-	if (node_old && node_new)
+	if (node_new) {
+		a_new = container_of(node_new, struct device_addr, node);
+
+		if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
+		    !a_new->broadcast) {
+
+			uint32_t mask = ~0;
+			uint32_t *a = (uint32_t *) &a_new->addr;
+
+			mask >>= a_new->mask;
+			a_new->broadcast = *a | mask;
+		}
+	}
+
+	if (node_old)
+		a_old = container_of(node_old, struct device_addr, node);
+
+	if (a_new && a_old) {
 		keep = true;
 
+		if (a_old->flags != a_new->flags)
+			keep = false;
+
+		if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
+		    a_new->broadcast != a_old->broadcast)
+			keep = false;
+	}
+
 	if (node_old) {
-		addr = container_of(node_old, struct device_addr, node);
-		if (!(addr->flags & DEVADDR_EXTERNAL) && addr->enabled && !keep)
-			system_del_address(dev, addr);
-		free(addr);
+		if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep)
+			system_del_address(dev, a_old);
+		free(a_old);
 	}
 
 	if (node_new) {
-		addr = container_of(node_new, struct device_addr, node);
-		if (!(addr->flags & DEVADDR_EXTERNAL) && !keep)
-			system_add_address(dev, addr);
-		addr->enabled = true;
+		if (!(a_new->flags & DEVADDR_EXTERNAL) && !keep)
+			system_add_address(dev, a_new);
+		a_new->enabled = true;
 	}
 }