From 6e6d58c2389c7610e75b5a766af873deb77377b0 Mon Sep 17 00:00:00 2001 From: Patrick Grimm Date: Mon, 15 Jun 2015 00:39:32 +0200 Subject: [PATCH] dhcpv4: use ubus for ipv4 dhcp range calculation Signed-off-by: Patrick Grimm --- src/dhcpv4.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/dhcpv4.c b/src/dhcpv4.c index a657e13..bc3ee31 100644 --- a/src/dhcpv4.c +++ b/src/dhcpv4.c @@ -119,18 +119,22 @@ 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; + //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)) { 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 = saddr->sin_addr; + struct in_addr addr = ubus_get_address4(iface->ifname); - ioctl(sock, SIOCGIFNETMASK, &ifreq); - struct in_addr mask = smask->sin_addr; + //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); -- 2.25.1