Fixup some pthread_t checking in channels
authorJames Golovich <james@gnuinter.net>
Mon, 15 Mar 2004 09:14:16 +0000 (09:14 +0000)
committerJames Golovich <james@gnuinter.net>
Mon, 15 Mar 2004 09:14:16 +0000 (09:14 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2438 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_h323.c
channels/chan_mgcp.c
channels/chan_sip.c
channels/chan_skinny.c
channels/chan_vofr.c
channels/chan_zap.c

index 70761d8..afecf0f 100755 (executable)
@@ -1271,7 +1271,7 @@ static int restart_monitor(void)
                ast_log(LOG_WARNING, "Cannot kill myself\n");
                return -1;
        }
-       if (monitor_thread && (monitor_thread != AST_PTHREADT_STOP)) {
+       if (monitor_thread && (monitor_thread != AST_PTHREADT_NULL)) {
                /* Wake up the thread */
                pthread_kill(monitor_thread, SIGURG);
        } else {
index 1554b33..f1fa9de 100755 (executable)
@@ -2569,7 +2569,7 @@ static int restart_monitor(void)
                ast_log(LOG_WARNING, "Cannot kill myself\n");
                return -1;
        }
-       if (monitor_thread) {
+       if (monitor_thread != AST_PTHREADT_NULL) {
                /* Wake up the thread */
                pthread_kill(monitor_thread, SIGURG);
        } else {
index bcf9ff9..7af4470 100755 (executable)
@@ -5829,7 +5829,7 @@ static int restart_monitor(void)
                ast_log(LOG_WARNING, "Cannot kill myself\n");
                return -1;
        }
-       if (monitor_thread) {
+       if (monitor_thread != AST_PTHREADT_NULL) {
                /* Wake up the thread */
                pthread_kill(monitor_thread, SIGURG);
        } else {
index 0a01bdc..cccb842 100755 (executable)
@@ -2426,7 +2426,7 @@ static int restart_monitor(void)
                ast_log(LOG_WARNING, "Cannot kill myself\n");
                return -1;
        }
-       if (monitor_thread) {
+       if (monitor_thread != AST_PTHREADT_NULL) {
                /* Wake up the thread */
                pthread_kill(monitor_thread, SIGURG);
        } else {
index 3d677bd..444701f 100755 (executable)
@@ -1008,7 +1008,7 @@ static int restart_monitor(void)
                ast_log(LOG_WARNING, "Cannot kill myself\n");
                return -1;
        }
-       if (monitor_thread) {
+       if (monitor_thread != AST_PTHREADT_NULL) {
                /* Wake up the thread */
                pthread_kill(monitor_thread, SIGURG);
        } else {
index 930a870..48675db 100755 (executable)
@@ -5182,7 +5182,7 @@ static int restart_monitor(void)
                ast_log(LOG_WARNING, "Cannot kill myself\n");
                return -1;
        }
-       if (monitor_thread) {
+       if (monitor_thread != AST_PTHREADT_NULL) {
                /* Just signal it to be sure it wakes up */
 #if 0
                pthread_cancel(monitor_thread);