X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=a657e13d325f9e4de34a8ec0e5c904d44967274d;hp=bc3ee312ef3b3dc2e79dd05cab034ff2ad579d29;hb=c5cb11650a1f7ff321b4ac190c8be7f533cf9636;hpb=6e6d58c2389c7610e75b5a766af873deb77377b0

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index bc3ee31..a657e13 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -119,22 +119,18 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 		}
 
 		// Create a range if not specified
-		//struct ifreq ifreq;
-		//strncpy(ifreq.ifr_name, iface->ifname, sizeof(ifreq.ifr_name));
-
-		//struct sockaddr_in *saddr = (struct sockaddr_in*)&ifreq.ifr_addr;
-		//struct sockaddr_in *smask = (struct sockaddr_in*)&ifreq.ifr_netmask;
-		//if (!(iface->dhcpv4_start.s_addr & htonl(0xffff0000)) &&
-		//		!(iface->dhcpv4_end.s_addr & htonl(0xffff0000)) &&
-		//		!ioctl(sock, SIOCGIFADDR, &ifreq)) {
+		struct ifreq ifreq;
+		strncpy(ifreq.ifr_name, iface->ifname, sizeof(ifreq.ifr_name));
+
+		struct sockaddr_in *saddr = (struct sockaddr_in*)&ifreq.ifr_addr;
+		struct sockaddr_in *smask = (struct sockaddr_in*)&ifreq.ifr_netmask;
 		if (!(iface->dhcpv4_start.s_addr & htonl(0xffff0000)) &&
-				!(iface->dhcpv4_end.s_addr & htonl(0xffff0000))) {
-			//struct in_addr addr = saddr->sin_addr;
-			struct in_addr addr = ubus_get_address4(iface->ifname);
+				!(iface->dhcpv4_end.s_addr & htonl(0xffff0000)) &&
+				!ioctl(sock, SIOCGIFADDR, &ifreq)) {
+			struct in_addr addr = saddr->sin_addr;
 
-			//ioctl(sock, SIOCGIFNETMASK, &ifreq);
-			//struct in_addr mask = smask->sin_addr;
-			struct in_addr mask = ubus_get_mask4(iface->ifname);
+			ioctl(sock, SIOCGIFNETMASK, &ifreq);
+			struct in_addr mask = smask->sin_addr;
 
 			uint32_t start = ntohl(iface->dhcpv4_start.s_addr);
 			uint32_t end = ntohl(iface->dhcpv4_end.s_addr);