udhcp: use libbb for config file parsing (by Vladimir)

[oweals/busybox.git] / networking / udhcp / leases.c

diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index 5d8775f63ea01f86541a6117c26b07225c9f6855..1745fee0338a46c7251014ca76f0a9f68c66b9d4 100644 (file)
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -12,10 +12,10 @@
 static struct dhcpOfferedAddr *oldest_expired_lease(void)
 {
        struct dhcpOfferedAddr *oldest = NULL;
+// TODO: use monotonic_sec()
        unsigned long oldest_lease = time(0);
        unsigned i;
 
-
        for (i = 0; i < server_config.max_leases; i++)
                if (oldest_lease > leases[i].expires) {
                        oldest_lease = leases[i].expires;
@@ -30,13 +30,14 @@ static void clear_lease(const uint8_t *chaddr, uint32_t yiaddr)
 {
        unsigned i, j;
 
-       for (j = 0; j < 16 && !chaddr[j]; j++);
+       for (j = 0; j < 16 && !chaddr[j]; j++)
+               continue;
 
        for (i = 0; i < server_config.max_leases; i++)
-               if ((j != 16 && memcmp(leases[i].chaddr, chaddr, 16) != 0)
+               if ((j != 16 && memcmp(leases[i].chaddr, chaddr, 16) == 0)
                 || (yiaddr && leases[i].yiaddr == yiaddr)
                ) {
-                       memset(&(leases[i]), 0, sizeof(struct dhcpOfferedAddr));
+                       memset(&(leases[i]), 0, sizeof(leases[i]));
                }
 }
 
@@ -95,49 +96,50 @@ struct dhcpOfferedAddr *find_lease_by_yiaddr(uint32_t yiaddr)
 
 
 /* check is an IP is taken, if it is, add it to the lease table */
-static int check_ip(uint32_t addr)
+static int nobody_responds_to_arp(uint32_t addr)
 {
-       static const uint8_t blank_chaddr[16]; /* 16 zero bytes */
+       /* 16 zero bytes */
+       static const uint8_t blank_chaddr[16] = { 0 };
+       /* = { 0 } helps gcc to put it in rodata, not bss */
 
        struct in_addr temp;
+       int r;
 
-       if (arpping(addr, server_config.server, server_config.arp, server_config.interface) == 0) {
-               temp.s_addr = addr;
-               bb_info_msg("%s belongs to someone, reserving it for %ld seconds",
-                       inet_ntoa(temp), server_config.conflict_time);
-               add_lease(blank_chaddr, addr, server_config.conflict_time);
-               return 1;
-       }
+       r = arpping(addr, server_config.server, server_config.arp, server_config.interface);
+       if (r)
+               return r;
+
+       temp.s_addr = addr;
+       bb_info_msg("%s belongs to someone, reserving it for %u seconds",
+               inet_ntoa(temp), (unsigned)server_config.conflict_time);
+       add_lease(blank_chaddr, addr, server_config.conflict_time);
        return 0;
 }
 
 
-/* find an assignable address, it check_expired is true, we check all the expired leases as well.
+/* find an assignable address, if check_expired is true, we check all the expired leases as well.
  * Maybe this should try expired leases by age... */
 uint32_t find_address(int check_expired)
 {
        uint32_t addr, ret;
        struct dhcpOfferedAddr *lease = NULL;
 
-       addr = ntohl(server_config.start); /* addr is in host order here */
-       for (;addr <= ntohl(server_config.end); addr++) {
-
+       addr = server_config.start_ip; /* addr is in host order here */
+       for (; addr <= server_config.end_ip; addr++) {
                /* ie, 192.168.55.0 */
-               if (!(addr & 0xFF)) continue;
-
+               if (!(addr & 0xFF))
+                       continue;
                /* ie, 192.168.55.255 */
-               if ((addr & 0xFF) == 0xFF) continue;
-
+               if ((addr & 0xFF) == 0xFF)
+                       continue;
                /* Only do if it isn't assigned as a static lease */
-               if (!reservedIp(server_config.static_leases, htonl(addr))) {
-
+               ret = htonl(addr);
+               if (!reservedIp(server_config.static_leases, ret)) {
                        /* lease is not taken */
-                       ret = htonl(addr);
                        lease = find_lease_by_yiaddr(ret);
-
                        /* no lease or it expired and we are checking for expired leases */
                        if ((!lease || (check_expired && lease_expired(lease)))
-                        && /* and it isn't on the network */ !check_ip(ret)
+                        && nobody_responds_to_arp(ret) /* it isn't used on the network */
                        ) {
                                return ret;
                        }