Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/udhcp/static_leases.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/udhcp/static_leases.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/networking/udhcp/static_leases.c

@@ -1 +1 @@
 /* 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 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,
+ * 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 *st_lease;
 
-/* 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 addStaticLease(struct static_lease **lease_struct, uint8_t *mac, uint32_t *ip)
+    /* 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;*/
+}
+
+/* Find static lease IP by mac */
+uint32_t FAST_FUNC get_static_nip_by_mac(struct static_lease *st_lease, void *mac)
+{
+    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 is_nip_reserved(struct static_lease *st_lease, uint32_t nip)
+{
+    while (st_lease) {
+        if (st_lease->nip == nip)
+            return 1;
+        st_lease = st_lease->next;
+    }
+
+    return 0;
+}
+
+#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 log_static_leases(struct static_lease **st_lease_pp)
 {
     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->ip = ip;
-    new_static_lease->next = NULL;
+    if (dhcp_verbose < 2)
+        return;
 
-    /* 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) {
-            cur = cur->next;
-        }
-
-        cur->next = new_static_lease;
-    }
-
-    return 1;
-}
-
-/* Check to see if a mac has an associated static lease */
-uint32_t getIpByMac(struct static_lease *lease_struct, void *arg)
-{
-    uint32_t return_ip;
-    struct static_lease *cur = lease_struct;
-    uint8_t *mac = arg;
-
-    return_ip = 0;
-
+    cur = *st_lease_pp;
     while (cur) {
-        /* If the client has the correct mac  */
-        if (memcmp(cur->mac, mac, 6) == 0) {
-            return_ip = *(cur->ip);
-        }
-
-        cur = cur->next;
-    }
-
-    return return_ip;
-}
-
-/* Check to see if an ip is reserved as a static ip */
-uint32_t 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;
-    }
-
-    return return_val;
-}
-
-#if ENABLE_FEATURE_UDHCP_DEBUG
-/* Print out static leases just to check what's going on */
-/* Takes the address of the pointer to the static_leases linked list */
-void 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));
-
+        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->nip
+        );
         cur = cur->next;
     }