Changeset 187

Timestamp:

08/19/04 23:41:28 (9 years ago)

Author:

alexcv

Message:

Fixed a few bugs?

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• src/auth.c (modified) (1 diff)
• src/gateway.c (modified) (3 diffs)
• src/ping_thread.c (modified) (2 diffs)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Header$
+
+2004-08-19 Alexandre Carmel-Veilleux <acv@acv.ca>
+        * Sort of fixed the hanging thread (with an explicit thread kill)
+        * Fixed ping code
+
 2004-08-13 Alexandre Carmel-Veilleux <acv@acv.ca>
         * All Auth Server configuration now handled by the "AuthServer" 

trunk/wifidog/src/auth.c

@@ -120 +120 @@
                 /* No longer needs to be locked */
                 pthread_mutex_unlock(&cond_mutex);
-                
+        
+                debug(LOG_DEBUG, "Running fw_counter()");
+        
                 fw_counter();
         }

trunk/wifidog/src/gateway.c

@@ -57 +57 @@
 extern int errno;
 
+static pthread_t tid_fw_counter; /* XXX Ugly hack */
+
 /**@internal
  * @brief Handles SIGCHLD signals to avoid zombie processes
@@ -79 +81 @@
         static  pthread_mutex_t sigterm_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+        /* XXX stupid openwrt bug */
+        pthread_kill(tid_fw_counter, SIGKILL);
+
         /* Makes sure we only call fw_destroy() once. */
         if (pthread_mutex_trylock(&sigterm_mutex))
-                return;
+                pthread_exit(NULL);
         
         fw_destroy();
@@ -179 +184 @@
 
         /* start clean up thread */
-        pthread_create(&tid, NULL, (void *)thread_client_timeout_check, NULL);
-        pthread_detach(tid);
+        pthread_create(&tid_fw_counter, NULL, (void *)thread_client_timeout_check, NULL);
+        pthread_detach(tid_fw_counter);
 
         /* start control thread */

trunk/wifidog/src/ping_thread.c

@@ -77 +77 @@
                 pthread_mutex_unlock(&cond_mutex);
 
-                fprintf(stderr, "BANG\n");
-                
                 ping();
         }
@@ -132 +130 @@
         }
 
-        snprintf(request, sizeof(request) - 1, "GET %s/ping HTTP/1.0\r\n"
-                        "User-Agent: WiFiDog %s\r\n"
-                        "Host: %s\r\n"
-                        "\r\n",
+        snprintf(request, sizeof(request) - 1, "GET %s/ping/ HTTP/1.0\n"
+                        "User-Agent: WiFiDog %s\n"
+                        "Host: %s\n"
+                        "\n",
                         auth_server->authserv_path,
                         VERSION,
                         auth_server->authserv_hostname);
+
+        send(sockfd, request, strlen(request), 0);
 
         numbytes = totalbytes = 0;