Changeset 256

Timestamp:

10/29/04 18:41:52 (9 years ago)

Author:

alexcv

Message:

Extra mutex logging and extra logging in ping_thread()

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• src/client_list.h (modified) (1 diff)
• src/conf.h (modified) (1 diff)
• src/firewall.c (modified) (4 diffs)
• src/fw_iptables.c (modified) (8 diffs)
• src/http.c (modified) (2 diffs)
• src/ping_thread.c (modified) (3 diffs)
• src/util.c (modified) (3 diffs)
• src/util.h (modified) (1 diff)
• src/wdctl_thread.c (modified) (5 diffs)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Header$
+
+2004-10-29 Alexandre Carmel-Veilleux <acv@acv.ca>
+        * src/ping_thread.c: Much new debugging information
+        * multiple files: Logging for all mutexes
+
 2004-10-28 Philippe April <philippe@philippeapril.com>
         * ipkg/rules: building ipkg-tools before packaging

trunk/wifidog/src/client_list.h

@@ -78 +78 @@
 void client_list_delete(t_client *client);
 
+#define LOCK_CLIENT_LIST() do { \
+        debug(LOG_DEBUG, "Locking client list"); \
+        pthread_mutex_lock(&client_list_mutex); \
+        debug(LOG_DEBUG, "Client list locked"); \
+} while (0)
+
+#define UNLOCK_CLIENT_LIST() do { \
+        debug(LOG_DEBUG, "Unlocking client list"); \
+        pthread_mutex_unlock(&client_list_mutex); \
+        debug(LOG_DEBUG, "Client list unlocked"); \
+} while (0)
+
 #endif /* _CLIENT_LIST_H_ */
-

trunk/wifidog/src/conf.h

@@ -131 +131 @@
 void mark_auth_server_bad(t_auth_serv *);
 
+#define LOCK_CONFIG() do { \
+        debug(LOG_DEBUG, "Locking config"); \
+        pthread_mutex_lock(&config_mutex); \
+        debug(LOG_DEBUG, "Config locked"); \
+} while (0)
+
+#define UNLOCK_CONFIG() do { \
+        debug(LOG_DEBUG, "Unlocking config"); \
+        pthread_mutex_unlock(&config_mutex); \
+        debug(LOG_DEBUG, "Config unlocked"); \
+} while (0)
+
 #endif /* _CONFIG_H_ */

trunk/wifidog/src/firewall.c

@@ -153 +153 @@
     }
 
-    pthread_mutex_lock(&client_list_mutex);
+    LOCK_CLIENT_LIST();
 
     for (p1 = p2 = client_get_first_client(); NULL != p1; p1 = p2) {
@@ -164 +164 @@
         incoming = p1->counters.outgoing;
 
-        pthread_mutex_unlock(&client_list_mutex);
+        UNLOCK_CLIENT_LIST();
         auth_server_request(&authresponse, REQUEST_TYPE_COUNTERS, ip, mac, token, incoming, outgoing);
-        pthread_mutex_lock(&client_list_mutex);
-
+        LOCK_CLIENT_LIST();
+        
         if (!(p1 = client_list_find(ip, mac))) {
             debug(LOG_ERR, "Node %s was freed while being re-validated!", ip);
@@ -180 +180 @@
 
                 /* Advertise the logout */
-                pthread_mutex_unlock(&client_list_mutex);
+                UNLOCK_CLIENT_LIST();
                 auth_server_request(&authresponse, REQUEST_TYPE_LOGOUT, ip, mac, token, 0, 0);
-                pthread_mutex_lock(&client_list_mutex);
+                LOCK_CLIENT_LIST();
             } else {
                 /*
@@ -229 +229 @@
         free(mac);
     }
-    pthread_mutex_unlock(&client_list_mutex);
-}
+    UNLOCK_CLIENT_LIST();
+}

trunk/wifidog/src/fw_iptables.c

@@ -87 +87 @@
     iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -d %s -j ACCEPT", config->gw_address);
 
-    pthread_mutex_lock(&config_mutex);
+    LOCK_CONFIG();
     
     for (auth_server = config->auth_servers; auth_server != NULL;
@@ -93 +93 @@
         iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -d %s -j ACCEPT", auth_server->authserv_hostname);
     }
-    
-    pthread_mutex_unlock(&config_mutex);
+
+    UNLOCK_CONFIG();
 
     /** Insert global rules BEFORE the "defaults" */
@@ -114 +114 @@
     iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -d %s -j ACCEPT", config->gw_address);
 
-    pthread_mutex_lock(&config_mutex);
+    LOCK_CONFIG();
     
     for (auth_server = config->auth_servers; auth_server != NULL;
@@ -121 +121 @@
     }
 
-    pthread_mutex_unlock(&config_mutex);
+    UNLOCK_CONFIG();
 
     /** Insert global rules BEFORE the "defaults" */
@@ -257 +257 @@
         if (2 == rc && EOF != rc) {
             debug(LOG_DEBUG, "Outgoing %s Bytes=%ld", ip, counter);
-            pthread_mutex_lock(&client_list_mutex);
+            LOCK_CLIENT_LIST();
             if ((p1 = client_list_find_by_ip(ip))) {
                 if (p1->counters.outgoing < counter) {
@@ -267 +267 @@
                 debug(LOG_ERR, "Could not find %s in client list", ip);
             }
-            pthread_mutex_unlock(&client_list_mutex);
+            UNLOCK_CLIENT_LIST();
         }
     }
@@ -289 +289 @@
         if (2 == rc && EOF != rc) {
             debug(LOG_DEBUG, "Incoming %s Bytes=%ld", ip, counter);
-            pthread_mutex_lock(&client_list_mutex);
+            LOCK_CLIENT_LIST();
             if ((p1 = client_list_find_by_ip(ip))) {
                 if (p1->counters.incoming < counter) {
@@ -299 +299 @@
                 debug(LOG_ERR, "Could not find %s in client list", ip);
             }
-            pthread_mutex_unlock(&client_list_mutex);
+            UNLOCK_CLIENT_LIST();
         }
     }

trunk/wifidog/src/http.c

@@ -139 +139 @@
                         /* We have their MAC address */
 
-                        pthread_mutex_lock(&client_list_mutex);
+                        LOCK_CLIENT_LIST();
                         
                         if ((client = client_list_find(webserver->clientAddr, mac)) == NULL) {
@@ -155 +155 @@
                         webserver->clientSock = -1;
 
-                        pthread_mutex_unlock(&client_list_mutex);
+                        UNLOCK_CLIENT_LIST();
 
                         /* That clientAddr may be freed prior to the thread

trunk/wifidog/src/ping_thread.c

@@ -64 +64 @@
                 /* Make sure we check the servers at the very begining */
                 /** @todo  Note that this will only help if the second server responds.  The logic of the ping itslef should be changed so it iterates in the list until it finds one that responds ox exausts the list */
+                debug(LOG_DEBUG, "Running ping()");
                 ping();
                 
@@ -108 +109 @@
                         auth_server->authserv_hostname);
         
+        debug(LOG_DEBUG, "Resolving IP");
         if ((h_addr = (struct in_addr *)wd_gethostbyname(auth_server->authserv_hostname)) == NULL) {
                 debug(LOG_ERR, "Failed to resolve %s via gethostbyname"
@@ -155 +157 @@
         numbytes = totalbytes = 0;
         while ((numbytes = read(sockfd, request + totalbytes, 
-                                MAX_BUF - (totalbytes + 1))) > 0)
+                                MAX_BUF - (totalbytes + 1))) > 0) {
                 totalbytes =+ numbytes;
+                debug(LOG_DEBUG, "Read %d bytes, total now %d", numbytes,
+                                totalbytes);
+        }
+
+        debug(LOG_DEBUG, "Done reading reply, total %d bytes", totalbytes);
         
         if (numbytes == -1) {

trunk/wifidog/src/util.c

@@ -100 +100 @@
                 return NULL;
         
-        pthread_mutex_lock(&ghbn_mutex);
+        LOCK_GHBN();
 
         he = gethostbyname(name);
@@ -106 +106 @@
         if (he == NULL) {
                 free(h_addr);
-                pthread_mutex_unlock(&ghbn_mutex);
+                UNLOCK_GHBN();
                 return NULL;
         }
@@ -113 +113 @@
         h_addr->s_addr = in_addr_temp->s_addr;
         
-        pthread_mutex_unlock(&ghbn_mutex);
+        UNLOCK_GHBN();
 
         return h_addr;

trunk/wifidog/src/util.h

@@ -33 +33 @@
 struct in_addr *wd_gethostbyname(const char *name);
 
+#define LOCK_GHBN() do { \
+        debug(LOG_DEBUG, "Locking wd_gethostbyname()"); \
+        pthread_mutex_lock(&ghbn_mutex); \
+        debug(LOG_DEBUG, "wd_gethostbyname() locked"); \
+} while (0)
+
+#define UNLOCK_CONFIG() do { \
+        debug(LOG_DEBUG, "Unlocking wd_gethostbyname()"); \
+        pthread_mutex_unlock(&ghbn_mutex); \
+        debug(LOG_DEBUG, "wd_gethostbyname() unlocked"); \
+} while (0)
+
 #endif /* _UTIL_H_ */
 

trunk/wifidog/src/wdctl_thread.c

@@ -204 +204 @@
         len = strlen(buffer);
 
-        pthread_mutex_lock(&client_list_mutex);
+        LOCK_CLIENT_LIST();
         
         first = client_get_first_client();
@@ -240 +240 @@
         }
         
-        pthread_mutex_unlock(&client_list_mutex);
+        UNLOCK_CLIENT_LIST();
         
         write(fd, buffer, len);
@@ -262 +262 @@
         debug(LOG_DEBUG, "Entering wdctl_reset...");
         
-        pthread_mutex_lock(&client_list_mutex);
-
+        LOCK_CLIENT_LIST();
         debug(LOG_DEBUG, "Argument: %s (@%x)", arg, arg);
         
@@ -271 +270 @@
         else {
                 debug(LOG_DEBUG, "Client not found.");
-                pthread_mutex_unlock(&client_list_mutex);
+                UNLOCK_CLIENT_LIST();
                 write(fd, "No", 2);
                 return;
@@ -284 +283 @@
         client_list_delete(node);
         
-        pthread_mutex_unlock(&client_list_mutex);
+        UNLOCK_CLIENT_LIST();
         
         write(fd, "Yes", 3);