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

udhcpd: disable opton to have absolute lease times in lease file

Browse Source 
(that does not work with dumpleases)
dumpleases: fix -a option.
networking/udhcp/*: code shrink, more compact static leases struture,
 better comments, etc

function                                             old     new   delta
find_free_or_expired_address                           -     147    +147
nobody_responds_to_arp                                 -      84     +84
read_opt                                             781     830     +49
dumpleases_main                                      435     447     +12
send_ACK                                             229     232      +3
read_staticlease                                      90      93      +3
addStaticLease                                        60      61      +1
getIpByMac                                            46      43      -3
reservedIp                                            31      20     -11
keywords                                             304     288     -16
send_offer                                           428     403     -25
write_leases                                         225     193     -32
read_leases                                          184     143     -41
read_yn                                               64       -     -64
find_address                                         191       -    -191
------------------------------------------------------------------------------
(add/remove: 2/2 grow/shrink: 5/6 up/down: 299/-383)          Total: -84 bytes
This commit is contained in:
Denis Vlasenko
2009-01-01 17:52:09 +00:00
parent b2ec03813c
commit 0416e3dde1
7 changed files with 191 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
networking/udhcp/static_leases.c
View File

@ -15,69 +15,49 @@
/* Takes the address of the pointer to the static_leases linked list,
* Address to a 6 byte mac address
* Address to a 4 byte ip address */
int FAST_FUNC addStaticLease(struct static_lease **lease_struct, uint8_t *mac, uint32_t *ip)
void FAST_FUNC addStaticLease(struct static_lease **lease_struct, uint8_t *mac, uint32_t ip)
{
struct static_lease *cur;
struct static_lease *new_static_lease;
/* Build new node */
new_static_lease = xmalloc(sizeof(struct static_lease));
new_static_lease->mac = mac;
new_static_lease = xzalloc(sizeof(struct static_lease));
memcpy(new_static_lease->mac, mac, 6);
new_static_lease->ip = ip;
new_static_lease->next = NULL;
/*new_static_lease->next = NULL;*/
/* If it's the first node to be added... */
if (*lease_struct == NULL) {
*lease_struct = new_static_lease;
} else {
cur = *lease_struct;
while (cur->next) {
struct static_lease *cur = *lease_struct;
while (cur->next)
cur = cur->next;
}
cur->next = new_static_lease;
}
return 1;
}
/* Check to see if a mac has an associated static lease */
uint32_t FAST_FUNC getIpByMac(struct static_lease *lease_struct, void *arg)
uint32_t FAST_FUNC getIpByMac(struct static_lease *lease_struct, void *mac)
{
uint32_t return_ip;
struct static_lease *cur = lease_struct;
uint8_t *mac = arg;
return_ip = 0;
while (cur) {
/* If the client has the correct mac */
if (memcmp(cur->mac, mac, 6) == 0) {
return_ip = *(cur->ip);
}
cur = cur->next;
while (lease_struct) {
if (memcmp(lease_struct->mac, mac, 6) == 0)
return lease_struct->ip;
lease_struct = lease_struct->next;
}
return return_ip;
return 0;
}
/* Check to see if an ip is reserved as a static ip */
uint32_t FAST_FUNC reservedIp(struct static_lease *lease_struct, uint32_t ip)
int FAST_FUNC reservedIp(struct static_lease *lease_struct, uint32_t ip)
{
struct static_lease *cur = lease_struct;
uint32_t return_val = 0;
while (cur) {
/* If the client has the correct ip */
if (*cur->ip == ip)
return_val = 1;
cur = cur->next;
while (lease_struct) {
if (lease_struct->ip == ip)
return 1;
lease_struct = lease_struct->next;
}
return return_val;
return 0;
}
#if ENABLE_UDHCP_DEBUG
@ -85,15 +65,14 @@ uint32_t FAST_FUNC reservedIp(struct static_lease *lease_struct, uint32_t ip)
/* Takes the address of the pointer to the static_leases linked list */
void FAST_FUNC printStaticLeases(struct static_lease **arg)
{
/* Get a pointer to the linked list */
struct static_lease *cur = *arg;
while (cur) {
/* printf("PrintStaticLeases: Lease mac Address: %x\n", cur->mac); */
printf("PrintStaticLeases: Lease mac Value: %x\n", *(cur->mac));
/* printf("PrintStaticLeases: Lease ip Address: %x\n", cur->ip); */
printf("PrintStaticLeases: Lease ip Value: %x\n", *(cur->ip));
printf("PrintStaticLeases: Lease mac Value: %02x:%02x:%02x:%02x:%02x:%02x\n",
cur->mac[0], cur->mac[1], cur->mac[2],
cur->mac[3], cur->mac[4], cur->mac[5]
);
printf("PrintStaticLeases: Lease ip Value: %x\n", cur->ip);
cur = cur->next;
}
}