emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcpd: remember and record hostnames; optimize get_option

Browse Source 
dumpleases: show hostnames

function                                             old     new   delta
add_lease                                            230     292     +62
send_offer                                           403     421     +18
send_ACK                                             232     249     +17
read_leases                                          249     258      +9
dumpleases_main                                      604     609      +5
nobody_responds_to_arp                                84      86      +2
udhcp_end_option                                      32      30      -2
udhcp_get_option                                     222     171     -51
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 6/2 up/down: 113/-53)            Total: 60 bytes
This commit is contained in:
Denis Vlasenko
2009-04-01 12:36:09 +00:00
parent 3266aa9ec2
commit bd79c3d337
8 changed files with 145 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
networking/udhcp/leases.c
View File

@@ -48,9 +48,12 @@ static void clear_lease(const uint8_t *chaddr, uint32_t yiaddr)
/* Add a lease into the table, clearing out any old ones */
struct dhcpOfferedAddr* FAST_FUNC add_lease(const uint8_t *chaddr, uint32_t yiaddr, leasetime_t leasetime)
struct dhcpOfferedAddr* FAST_FUNC add_lease(
const uint8_t *chaddr, uint32_t yiaddr,
leasetime_t leasetime, uint8_t *hostname)
{
struct dhcpOfferedAddr *oldest;
uint8_t hostname_length;
/* clean out any old ones */
clear_lease(chaddr, yiaddr);
@@ -58,6 +61,19 @@ struct dhcpOfferedAddr* FAST_FUNC add_lease(const uint8_t *chaddr, uint32_t yiad
oldest = oldest_expired_lease();
if (oldest) {
oldest->hostname[0] = '\0';
if (hostname) {
hostname_length = hostname[-1]; /* look at option size byte */
if (hostname_length > sizeof(oldest->hostname))
hostname_length = sizeof(oldest->hostname);
hostname = (uint8_t*) safe_strncpy((char*)oldest->hostname, (char*)hostname, hostname_length);
/* sanitization (s/non-ACSII/^/g) */
while (*hostname) {
if (*hostname < ' ' || *hostname > 126)
*hostname = '^';
hostname++;
}
}
memcpy(oldest->chaddr, chaddr, 16);
oldest->yiaddr = yiaddr;
oldest->expires = time(NULL) + leasetime;
@@ -117,7 +133,7 @@ static int nobody_responds_to_arp(uint32_t addr)
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);
add_lease(blank_chaddr, addr, server_config.conflict_time, NULL);
return 0;
}