- spelling

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

diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index add114f6c41f03aa6b2cf6dbeb65a6dce3f874ce..bb08c3adbe7f7ea9d8cd5a197c8ad7e241c12b1f 100644 (file)
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -1,5 +1,5 @@
-/* 
- * leases.c -- tools to manage DHCP leases 
+/*
+ * leases.c -- tools to manage DHCP leases
  * Russ Dill <Russ.Dill@asu.edu> July 2001
  */
 
@@ -16,16 +16,18 @@
 #include "arpping.h"
 #include "common.h"
 
+#include "static_leases.h"
 
-unsigned char blank_chaddr[] = {[0 ... 15] = 0};
+
+uint8_t blank_chaddr[] = {[0 ... 15] = 0};
 
 /* clear every lease out that chaddr OR yiaddr matches and is nonzero */
-void clear_lease(u_int8_t *chaddr, u_int32_t yiaddr)
+void clear_lease(uint8_t *chaddr, uint32_t yiaddr)
 {
        unsigned int i, j;
-       
+
        for (j = 0; j < 16 && !chaddr[j]; j++);
-       
+
        for (i = 0; i < server_config.max_leases; i++)
                if ((j != 16 && !memcmp(leases[i].chaddr, chaddr, 16)) ||
                    (yiaddr && leases[i].yiaddr == yiaddr)) {
@@ -35,21 +37,21 @@ void clear_lease(u_int8_t *chaddr, u_int32_t yiaddr)
 
 
 /* add a lease into the table, clearing out any old ones */
-struct dhcpOfferedAddr *add_lease(u_int8_t *chaddr, u_int32_t yiaddr, unsigned long lease)
+struct dhcpOfferedAddr *add_lease(uint8_t *chaddr, uint32_t yiaddr, unsigned long lease)
 {
        struct dhcpOfferedAddr *oldest;
-       
+
        /* clean out any old ones */
        clear_lease(chaddr, yiaddr);
-               
+
        oldest = oldest_expired_lease();
-       
+
        if (oldest) {
                memcpy(oldest->chaddr, chaddr, 16);
                oldest->yiaddr = yiaddr;
                oldest->expires = time(0) + lease;
        }
-       
+
        return oldest;
 }
 
@@ -58,7 +60,7 @@ struct dhcpOfferedAddr *add_lease(u_int8_t *chaddr, u_int32_t yiaddr, unsigned l
 int lease_expired(struct dhcpOfferedAddr *lease)
 {
        return (lease->expires < (unsigned long) time(0));
-}      
+}
 
 
 /* Find the oldest expired lease, NULL if there are no expired leases */
@@ -68,43 +70,43 @@ struct dhcpOfferedAddr *oldest_expired_lease(void)
        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(u_int8_t *chaddr)
+struct dhcpOfferedAddr *find_lease_by_chaddr(uint8_t *chaddr)
 {
        unsigned int i;
 
        for (i = 0; i < server_config.max_leases; i++)
                if (!memcmp(leases[i].chaddr, chaddr, 16)) return &(leases[i]);
-       
+
        return NULL;
 }
 
 
 /* Find the first lease that matches yiaddr, NULL is no match */
-struct dhcpOfferedAddr *find_lease_by_yiaddr(u_int32_t yiaddr)
+struct dhcpOfferedAddr *find_lease_by_yiaddr(uint32_t yiaddr)
 {
        unsigned int i;
 
        for (i = 0; i < server_config.max_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(u_int32_t addr)
+static int check_ip(uint32_t addr)
 {
        struct in_addr temp;
 
@@ -120,10 +122,10 @@ static int check_ip(u_int32_t addr)
 
 /* find an assignable address, it check_expired is true, we check all the expired leases as well.
  * Maybe this should try expired leases by age... */
-u_int32_t find_address(int check_expired) 
+uint32_t find_address(int check_expired)
 {
-       u_int32_t addr, ret;
-       struct dhcpOfferedAddr *lease = NULL;           
+       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++) {
@@ -134,6 +136,10 @@ u_int32_t find_address(int check_expired)
                /* 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 */
                ret = htonl(addr);
                if ((!(lease = find_lease_by_yiaddr(ret)) ||
@@ -142,10 +148,11 @@ u_int32_t find_address(int check_expired)
                     (check_expired  && lease_expired(lease))) &&
 
                     /* and it isn't on the network */
-                    !check_ip(ret)) {
+                    !check_ip(ret)) {
                        return ret;
                        break;
                }
        }
+       }
        return 0;
 }