udhcp: add PXELINUX config file option (code 209) definition

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

diff --git a/networking/udhcp/static_leases.c b/networking/udhcp/static_leases.c
index 1e77a58f9d2f083d48f82e327b325eb0acc1d5db..f4a24ab627a955180f6d385dedb58b424fc42de5 100644 (file)
--- a/networking/udhcp/static_leases.c
+++ b/networking/udhcp/static_leases.c
@@ -1,78 +1,76 @@
 /* vi: set sw=4 ts=4: */
 /*
- * static_leases.c -- Couple of functions to assist with storing and
- * retrieving data for static leases
+ * Storing and retrieving data for static leases
  *
  * Wade Berrier <wberrier@myrealbox.com> September 2004
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include "common.h"
 #include "dhcpd.h"
 
-
 /* 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 */
-void FAST_FUNC addStaticLease(struct static_lease **lease_struct, uint8_t *mac, uint32_t ip)
+ * address to a 6 byte mac address,
+ * 4 byte IP address */
+void FAST_FUNC add_static_lease(struct static_lease **st_lease_pp,
+               uint8_t *mac,
+               uint32_t nip)
 {
-       struct static_lease *new_static_lease;
-
-       /* Build new node */
-       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;*/
+       struct static_lease *st_lease;
 
-       /* If it's the first node to be added... */
-       if (*lease_struct == NULL) {
-               *lease_struct = new_static_lease;
-       } else {
-               struct static_lease *cur = *lease_struct;
-               while (cur->next)
-                       cur = cur->next;
-               cur->next = new_static_lease;
+       /* Find the tail of the list */
+       while ((st_lease = *st_lease_pp) != NULL) {
+               st_lease_pp = &st_lease->next;
        }
+
+       /* Add new node */
+       *st_lease_pp = st_lease = xzalloc(sizeof(*st_lease));
+       memcpy(st_lease->mac, mac, 6);
+       st_lease->nip = nip;
+       /*st_lease->next = NULL;*/
 }
 
-/* Check to see if a mac has an associated static lease */
-uint32_t FAST_FUNC getIpByMac(struct static_lease *lease_struct, void *mac)
+/* Find static lease IP by mac */
+uint32_t FAST_FUNC get_static_nip_by_mac(struct static_lease *st_lease, void *mac)
 {
-       while (lease_struct) {
-               if (memcmp(lease_struct->mac, mac, 6) == 0)
-                       return lease_struct->ip;
-               lease_struct = lease_struct->next;
+       while (st_lease) {
+               if (memcmp(st_lease->mac, mac, 6) == 0)
+                       return st_lease->nip;
+               st_lease = st_lease->next;
        }
 
        return 0;
 }
 
-/* Check to see if an ip is reserved as a static ip */
-int FAST_FUNC reservedIp(struct static_lease *lease_struct, uint32_t ip)
+/* Check to see if an IP is reserved as a static IP */
+int FAST_FUNC is_nip_reserved(struct static_lease *st_lease, uint32_t nip)
 {
-       while (lease_struct) {
-               if (lease_struct->ip == ip)
+       while (st_lease) {
+               if (st_lease->nip == nip)
                        return 1;
-               lease_struct = lease_struct->next;
+               st_lease = st_lease->next;
        }
 
        return 0;
 }
 
-#if ENABLE_UDHCP_DEBUG
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
 /* Print out static leases just to check what's going on */
 /* Takes the address of the pointer to the static_leases linked list */
-void FAST_FUNC printStaticLeases(struct static_lease **arg)
+void FAST_FUNC log_static_leases(struct static_lease **st_lease_pp)
 {
-       struct static_lease *cur = *arg;
+       struct static_lease *cur;
+
+       if (dhcp_verbose < 2)
+               return;
 
+       cur = *st_lease_pp;
        while (cur) {
-               printf("PrintStaticLeases: Lease mac Value: %02x:%02x:%02x:%02x:%02x:%02x\n",
+               bb_info_msg("static lease: mac:%02x:%02x:%02x:%02x:%02x:%02x nip:%x",
                        cur->mac[0], cur->mac[1], cur->mac[2],
-                       cur->mac[3], cur->mac[4], cur->mac[5]
+                       cur->mac[3], cur->mac[4], cur->mac[5],
+                       cur->nip
                );
-               printf("PrintStaticLeases: Lease ip Value: %x\n", cur->ip);
                cur = cur->next;
        }
 }