X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=src%2Fconfig.c;h=7e23eb28893ed8e1c9af4656261f539ff5e4592e;hb=cf29925b29a4e4e38ab88573f12ec075eacb3d22;hp=2c35aab2c0d4f97d7c4b4079950671602aac7a7c;hpb=028ab85da8ef40af43aeb48129ffa32c98503336;p=project%2Fodhcpd.git

diff --git a/src/config.c b/src/config.c
index 2c35aab..7e23eb2 100644
--- a/src/config.c
+++ b/src/config.c
@@ -236,14 +236,14 @@ static void close_interface(struct interface *iface)
 	if (iface->head.next)
 		list_del(&iface->head);
 
-	setup_router_interface(iface, false);
-	setup_dhcpv6_interface(iface, false);
-	setup_ndp_interface(iface, false);
-	setup_dhcpv4_interface(iface, false);
+	router_setup_interface(iface, false);
+	dhcpv6_setup_interface(iface, false);
+	ndp_setup_interface(iface, false);
+	dhcpv4_setup_interface(iface, false);
 
 	clean_interface(iface);
 	free(iface->addr4);
-	free(iface->ia_addr);
+	free(iface->addr6);
 	free(iface->ifname);
 	free(iface);
 }
@@ -449,13 +449,13 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 	}
 
 	if (get_addrs) {
-		ssize_t len = odhcpd_get_interface_addresses(iface->ifindex,
-						true, &iface->ia_addr);
+		ssize_t len = netlink_get_interface_addrs(iface->ifindex,
+						true, &iface->addr6);
 
 		if (len > 0)
-			iface->ia_addr_len = len;
+			iface->addr6_len = len;
 
-		len = odhcpd_get_interface_addresses(iface->ifindex,
+		len = netlink_get_interface_addrs(iface->ifindex,
 						false, &iface->addr4);
 		if (len > 0)
 			iface->addr4_len = len;
@@ -843,10 +843,10 @@ void odhcpd_reload(void)
 				i->ndp = (master && master->ndp == MODE_RELAY) ?
 						MODE_RELAY : MODE_DISABLED;
 
-			setup_router_interface(i, !i->ignore || i->ra != MODE_DISABLED);
-			setup_dhcpv6_interface(i, !i->ignore || i->dhcpv6 != MODE_DISABLED);
-			setup_ndp_interface(i, !i->ignore || i->ndp != MODE_DISABLED);
-			setup_dhcpv4_interface(i, !i->ignore || i->dhcpv4 != MODE_DISABLED);
+			router_setup_interface(i, !i->ignore || i->ra != MODE_DISABLED);
+			dhcpv6_setup_interface(i, !i->ignore || i->dhcpv6 != MODE_DISABLED);
+			ndp_setup_interface(i, !i->ignore || i->ndp != MODE_DISABLED);
+			dhcpv4_setup_interface(i, !i->ignore || i->dhcpv4 != MODE_DISABLED);
 		} else
 			close_interface(i);
 	}
@@ -887,7 +887,7 @@ void odhcpd_run(void)
 	signal(SIGHUP, handle_signal);
 
 #ifdef WITH_UBUS
-	while (init_ubus())
+	while (ubus_init())
 		sleep(1);
 #endif