X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=0f613b2206a985fcfae634b1e2acf6721273706b;hp=a657e13d325f9e4de34a8ec0e5c904d44967274d;hb=a278f7fbafe043164204502d1c04632af8cb5dea;hpb=681ba23d0b3678a9a0c90ef938cd1d48f2ee6046 diff --git a/src/dhcpv4.c b/src/dhcpv4.c index a657e13..0f613b2 100644 --- a/src/dhcpv4.c +++ b/src/dhcpv4.c @@ -119,18 +119,11 @@ 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 in_addr addr = saddr->sin_addr; + !(iface->dhcpv4_end.s_addr & htonl(0xffff0000))) { + struct in_addr addr = ubus_get_address4(iface->ifname); - ioctl(sock, SIOCGIFNETMASK, &ifreq); - struct in_addr mask = smask->sin_addr; + struct in_addr mask = ubus_get_mask4(iface->ifname); uint32_t start = ntohl(iface->dhcpv4_start.s_addr); uint32_t end = ntohl(iface->dhcpv4_end.s_addr);