diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-03 15:47:50 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-03 15:47:50 +0000 |
| commit | 42b3dea9bfb8ac595c71089ee23012f44dd43eb2 (patch) | |
| tree | b7b86d06a574d2af72bc79536d399905b5619959 /networking/udhcp/leases.c | |
| parent | 54e19da86d5496ec5f5787b85a2b6342be1d63d4 (diff) | |
| download | busybox-42b3dea9bfb8ac595c71089ee23012f44dd43eb2.tar.gz | |
udhcp: many small fixes:
* arpping(): smaller and even probably fixed
* lots of variables/params converted: ulong -> uint32_t
* uptime() nuked in favor of monotonic_sec()
* udhcp_get_packet(): only one "bad vendor", simplify
function old new delta
reservedIp 36 35 -1
udhcpc_main 2462 2460 -2
addStaticLease 64 62 -2
static.broken_vendors 16 - -16
uptime 19 - -19
udhcpd_main 1273 1238 -35
udhcp_get_packet 223 184 -39
.rodata 144162 144106 -56
arpping 690 609 -81
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 0/7 up/down: 0/-251) Total: -251 bytes
text data bss dec hex filename
734241 3028 14400 751669 b7835 busybox_old
734005 3028 14400 751433 b7749 busybox_unstripped
Diffstat (limited to 'networking/udhcp/leases.c')
| -rw-r--r-- | networking/udhcp/leases.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c index ceec07345..997daea6c 100644 --- a/networking/udhcp/leases.c +++ b/networking/udhcp/leases.c @@ -95,24 +95,26 @@ 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 */ 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) { @@ -129,15 +131,14 @@ uint32_t find_address(int check_expired) 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; } |