X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fudhcp%2Fleases.c;h=1745fee0338a46c7251014ca76f0a9f68c66b9d4;hb=3718832a1542f7bf786a1678741b8566ad3a35c6;hp=4c69c1f933e362526d1f6d552894862410031ca1;hpb=63fc1a9e08fabfc8ba96bad80731673ef40bf5cb;p=oweals%2Fbusybox.git diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c index 4c69c1f93..1745fee03 100644 --- a/networking/udhcp/leases.c +++ b/networking/udhcp/leases.c @@ -4,41 +4,46 @@ * Russ Dill July 2001 */ -#include -#include -#include -#include -#include - -#include "dhcpd.h" -#include "files.h" -#include "options.h" -#include "leases.h" -#include "arpping.h" #include "common.h" +#include "dhcpd.h" -#include "static_leases.h" +/* Find the oldest expired lease, NULL if there are no expired leases */ +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; + oldest = &(leases[i]); + } + return oldest; +} -uint8_t blank_chaddr[] = {[0 ... 15] = 0}; /* clear every lease out that chaddr OR yiaddr matches and is nonzero */ -void clear_lease(uint8_t *chaddr, uint32_t yiaddr) +static void clear_lease(const uint8_t *chaddr, uint32_t yiaddr) { - unsigned int i, j; + 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)) || - (yiaddr && leases[i].yiaddr == yiaddr)) { - memset(&(leases[i]), 0, sizeof(struct dhcpOfferedAddr)); + if ((j != 16 && memcmp(leases[i].chaddr, chaddr, 16) == 0) + || (yiaddr && leases[i].yiaddr == yiaddr) + ) { + memset(&(leases[i]), 0, sizeof(leases[i])); } } /* add a lease into the table, clearing out any old ones */ -struct dhcpOfferedAddr *add_lease(uint8_t *chaddr, uint32_t yiaddr, unsigned long lease) +struct dhcpOfferedAddr *add_lease(const uint8_t *chaddr, uint32_t yiaddr, unsigned long lease) { struct dhcpOfferedAddr *oldest; @@ -64,31 +69,14 @@ int lease_expired(struct dhcpOfferedAddr *lease) } -/* Find the oldest expired lease, NULL if there are no expired leases */ -struct dhcpOfferedAddr *oldest_expired_lease(void) -{ - struct dhcpOfferedAddr *oldest = NULL; - unsigned long oldest_lease = time(0); - unsigned int i; - - - for (i = 0; i < server_config.max_leases; i++) - if (oldest_lease > leases[i].expires) { - oldest_lease = leases[i].expires; - oldest = &(leases[i]); - } - return oldest; - -} - - /* Find the first lease that matches chaddr, NULL if no match */ -struct dhcpOfferedAddr *find_lease_by_chaddr(uint8_t *chaddr) +struct dhcpOfferedAddr *find_lease_by_chaddr(const uint8_t *chaddr) { - unsigned int i; + unsigned i; for (i = 0; i < server_config.max_leases; i++) - if (!memcmp(leases[i].chaddr, chaddr, 16)) return &(leases[i]); + if (!memcmp(leases[i].chaddr, chaddr, 16)) + return &(leases[i]); return NULL; } @@ -97,63 +85,65 @@ struct dhcpOfferedAddr *find_lease_by_chaddr(uint8_t *chaddr) /* Find the first lease that matches yiaddr, NULL is no match */ struct dhcpOfferedAddr *find_lease_by_yiaddr(uint32_t yiaddr) { - unsigned int i; + unsigned i; for (i = 0; i < server_config.max_leases; i++) - if (leases[i].yiaddr == yiaddr) return &(leases[i]); + if (leases[i].yiaddr == yiaddr) + return &(leases[i]); return NULL; } /* 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) { + /* 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; + + r = arpping(addr, server_config.server, server_config.arp, server_config.interface); + if (r) + return r; - if (arpping(addr, server_config.server, server_config.arp, server_config.interface) == 0) { - temp.s_addr = addr; - LOG(LOG_INFO, "%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; - } else return 0; + 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; - - /* Only do if it isn't an assigned as a static lease */ - if(!reservedIp(server_config.static_leases, htonl(addr))) - { - - /* lease is not taken */ + if ((addr & 0xFF) == 0xFF) + continue; + /* Only do if it isn't assigned as a static lease */ ret = htonl(addr); - if ((!(lease = find_lease_by_yiaddr(ret)) || - - /* or it expired and we are checking for expired leases */ - (check_expired && lease_expired(lease))) && - - /* and it isn't on the network */ - !check_ip(ret)) { - return ret; - break; + if (!reservedIp(server_config.static_leases, ret)) { + /* lease is not taken */ + 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))) + && nobody_responds_to_arp(ret) /* it isn't used on the network */ + ) { + return ret; + } } } - } return 0; }