Merge pull request #361 from metalefty/do-not-attempt-to-trap-sigkill

Do not attempt to trap SIGKILL part 2

sesman/sig.c

@@ -158,7 +158,6 @@ sig_handler_thread(void *arg)
     sigaddset(&waitmask, SIGHUP);
     sigaddset(&waitmask, SIGCHLD);
     sigaddset(&waitmask, SIGTERM);
-    sigaddset(&waitmask, SIGKILL);
     sigaddset(&waitmask, SIGINT);
 
     //  sigaddset(&waitmask, SIGFPE);
@@ -188,11 +187,6 @@ sig_handler_thread(void *arg)
                 LOG_DBG("sesman received SIGINT", 0);
                 sig_sesman_shutdown(recv_signal);
                 break;
-            case SIGKILL:
-                /* we die */
-                LOG_DBG("sesman received SIGKILL", 0);
-                sig_sesman_shutdown(recv_signal);
-                break;
             case SIGTERM:
                 /* we die */
                 LOG_DBG("sesman received SIGTERM", 0);

tests/tcp_proxy/main.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <locale.h>
 #include <netdb.h>
-#include <sys/types.h> 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -397,13 +397,6 @@ g_signal_user_interrupt(void (*func)(int))
     signal(SIGINT, func);
 }
 
-/*****************************************************************************/
-static void APP_CC
-g_signal_kill(void (*func)(int))
-{
-    signal(SIGKILL, func);
-}
-
 /*****************************************************************************/
 static void APP_CC
 g_signal_terminate(void (*func)(int))
@@ -685,7 +678,6 @@ main(int argc, char **argv)
 
     g_init("tcp_proxy");
     g_signal_user_interrupt(proxy_shutdown); /* SIGINT  */
-    g_signal_kill(proxy_shutdown);           /* SIGKILL */
     g_signal_usr1(clear_counters);           /* SIGUSR1 */
     g_signal_terminate(proxy_shutdown);      /* SIGTERM */