Changeset 33

Timestamp:

04/05/04 22:56:46 (9 years ago)

Author:

alexcv

Message:

Some clean up in list handlings

Location:

trunk/wifidog/src

Files:

• child.c (modified) (1 diff)
• firewall.c (modified) (4 diffs)
• firewall.h (modified) (1 diff)

trunk/wifidog/src/child.c

@@ -129 +129 @@
 {
 
-        if (ci->mac != NULL) {
+        if (ci->mac != NULL)
                 free(ci->mac);
-        }
         
-        if (ci->ip != NULL) {
+        if (ci->ip != NULL)
                 free(ci->ip);
-        }
 
         free(ci);

trunk/wifidog/src/firewall.c

@@ -30 +30 @@
 extern s_config config;
 
-t_node list;
-t_node *firstnode;
-t_node *curnode;
+t_node *firstnode = NULL;
 
 int
@@ -220 +218 @@
 node_init(void)
 {
-    firstnode = curnode = &list;
-    firstnode->next = NULL;
+    firstnode = NULL;
 }
 
@@ -227 +224 @@
 node_add(char *ip, char *mac, char *token, long int counter, int active)
 {
-    void *ptr;
-
-    ptr = curnode;
-
-    strcpy(curnode->ip, ip);
-    strcpy(curnode->mac, mac);
-    strcpy(curnode->token, token);
+    t_node *curnode,
+           *prevnode;
+
+    prevnode = NULL;
+    curnode = firstnode;
+
+    while (curnode != NULL) {
+            prevnode = curnode;
+            curnode = curnode->next;
+    }
+
+    curnode = (t_node *)malloc(sizeof(t_node));
+    
+    if (curnode == NULL) {
+            debug(D_LOG_DEBUG, "Out of memory");
+            exit(-1);
+    }
+
+    memset(curnode, 0, sizeof(t_node));
+
+    curnode->ip = strdup(ip);
+    curnode->mac = strdup(mac);
+    curnode->token = strdup(token);
     curnode->counter = counter;
     curnode->active = active;
+
+    if (prevnode == NULL) {
+            firstnode = curnode;
+    } else {
+            prevnode->next = curnode;
+    }
     
-
-    curnode->next = (t_node *)malloc(sizeof(t_node));
-    curnode = curnode->next;
-
     debug(D_LOG_DEBUG, "Added a new node to linked list: IP: %s Token: %s", ip, token);
 
-    return ptr;
+    return curnode;
 }
 
@@ -280 +295 @@
 {
 
-        /* The ip, mac and token maybe shouldn't be fixed-length strings... */
+        if (node->mac != NULL)
+                free(node->mac);
+
+        if (node->ip != NULL)
+                free(node->ip);
+
+        if (node->token != NULL)
+                free(node->token);
         
         free(node);

trunk/wifidog/src/firewall.h

@@ -30 +30 @@
 typedef struct {
     void *next;
-    char ip[16];
-    char mac[18];
-    char token[33];
+    char *ip,
+         *mac,
+         *token;
     int active; /* boolean */
     long int counter;