Add termination handler to wdctl thread instead of exit()

Author: acv

src/commandline.c

@@ -40,14 +40,7 @@
 /*
  * Holds an argv that could be passed to exec*() if we restart ourselves
  */
-<<<<<<< HEAD
 char ** restartargv = NULL;
-=======
-/* Declare variable */
-extern char **restartargv;
-/* Define variable */
-char **restartargv = NULL;
->>>>>>> b80bc0b523d60a5c16040ef8a66827aab13541b3
 
 /**
  * A flag to denote whether we were restarted via a parent wifidog, or started normally
@@ -85,18 +78,11 @@ usage(void)
  * also populates restartargv
  */
 void
-<<<<<<< HEAD
-parse_commandline(int argc, char **argv) {
-	int c;
-	int skiponrestart;
-	int i;
-=======
 parse_commandline(int argc, char **argv)
 {
     int c;
     int skiponrestart;
     int i;
->>>>>>> b80bc0b523d60a5c16040ef8a66827aab13541b3
 
     s_config *config = config_get_config();
 
@@ -106,97 +92,6 @@ parse_commandline(int argc, char **argv)
     restartargv[i++] = safe_strdup(argv[0]);
 
     while (-1 != (c = getopt(argc, argv, "c:hfd:sw:vx:i:"))) {
-
-<<<<<<< HEAD
-		skiponrestart = 0;
-
-		switch(c) {
-
-			case 'h':
-				usage();
-				exit(1);
-				break;
-
-			case 'c':
-				if (optarg) {
-                    free(config->configfile);
-                    config->configfile = safe_strdup(optarg);
-				}
-				break;
-
-			case 'w':
-				if (optarg) {
-					free(config->wdctl_sock);
-					config->wdctl_sock = safe_strdup(optarg);
-				}
-				break;
-
-			case 'f':
-				skiponrestart = 1;
-				config->daemon = 0;
-				break;
-
-			case 'd':
-				if (optarg) {
-					config->debuglevel = atoi(optarg);
-				}
-				break;
-
-			case 's':
-				config->log_syslog = 1;
-				break;
-
-			case 'v':
-				fprintf(stdout, "This is WiFiDog version " VERSION "\n");
-				exit(1);
-				break;
-
-			case 'x':
-				skiponrestart = 1;
-				if (optarg) {
-					restart_orig_pid = atoi(optarg);
-				}
-				else {
-					fprintf(stdout, "The expected PID to the -x switch was not supplied!");
-					exit(1);
-				}
-				break;
-
-			case 'i':
-				if (optarg) {
-					free(config->internal_sock);
-					config->internal_sock = safe_strdup(optarg);
-				}
-				break;
-
-			default:
-				usage();
-				exit(1);
-				break;
-
-		}
-
-		if (!skiponrestart) {
-			/* Add it to restartargv */
-			safe_asprintf(&(restartargv[i++]), "-%c", c);
-			if (optarg) {
-				restartargv[i++] = safe_strdup(optarg);
-			}
-		}
-
-	}
-
-	/* Finally, we should add  the -x, pid and NULL to restartargv
-	 * HOWEVER we cannot do it here, since this is called before we fork to background
-	 * so we'll leave this job to gateway.c after forking is completed
-	 * so that the correct PID is assigned
-	 *
-	 * We add 3 nulls, and the first 2 will be overridden later
-	 */
-	restartargv[i++] = NULL;
-	restartargv[i++] = NULL;
-	restartargv[i++] = NULL;
-=======
         skiponrestart = 0;
 
         switch (c) {
@@ -284,6 +179,4 @@ parse_commandline(int argc, char **argv)
     restartargv[i++] = NULL;
     restartargv[i++] = NULL;
     restartargv[i++] = NULL;
->>>>>>> b80bc0b523d60a5c16040ef8a66827aab13541b3
-
 }

src/gateway.c

@@ -258,6 +258,7 @@ void
 termination_handler(int s)
 {
     static pthread_mutex_t sigterm_mutex = PTHREAD_MUTEX_INITIALIZER;
+    pthread_t self = pthread_self();
 
     debug(LOG_INFO, "Handler for termination caught signal %d", s);
 
@@ -277,11 +278,11 @@ termination_handler(int s)
      * termination handler) from happening so we need to explicitly kill the threads 
      * that use that
      */
-    if (tid_fw_counter) {
+    if (tid_fw_counter && self != tid_fw_counter) {
         debug(LOG_INFO, "Explicitly killing the fw_counter thread");
         pthread_kill(tid_fw_counter, SIGKILL);
     }
-    if (tid_ping) {
+    if (tid_ping && self != tid_ping) {
         debug(LOG_INFO, "Explicitly killing the ping thread");
         pthread_kill(tid_ping, SIGKILL);
     }

src/wdctl_thread.c

@@ -95,7 +95,7 @@ thread_wdctl(void *arg)
 
     if (wdctl_socket_server < 0) {
         debug(LOG_DEBUG, "Could not get server socket: %s", strerror(errno));
-        terminate_handler();
+        termination_handler(0);
     }
     debug(LOG_DEBUG, "Got server socket %d", wdctl_socket_server);
 
@@ -112,12 +112,12 @@ thread_wdctl(void *arg)
     /* Which to use, AF_UNIX, PF_UNIX, AF_LOCAL, PF_LOCAL? */
     if (bind(wdctl_socket_server, (struct sockaddr *)&sa_un, sizeof(struct sockaddr_un))) {
         debug(LOG_ERR, "Could not bind control socket: %s", strerror(errno));
-        terminate_handler();
+        termination_handler(0);
     }
 
     if (listen(wdctl_socket_server, 5)) {
         debug(LOG_ERR, "Could not listen on control socket: %s", strerror(errno));
-        terminate_handler();
+        termination_handler(0);
     }
 
     while (1) {