Fixup some pthread_t checking in channels

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2438 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 70761d883618c5fd7868ce623bc3b4d9ac3db24f..afecf0f3db9052e1bf489c0caadd9e74e4dfe596 100755 (executable)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -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 {

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 1554b33655ed715e6b73e12f780399681443478d..f1fa9dec8a5ad2fb194aa77af663e1737884fbbf 100755 (executable)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -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 {

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index bcf9ff9a26ace13f67fd34d6600b2739fde2af1f..7af447007cc0bcda18ec4974582ae1358463a43f 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -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 {

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 0a01bdc577673818e783ed03e1271665689071a5..cccb8429cd740e3c3e1b6272b54010c06316b850 100755 (executable)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -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 {

diff --git a/channels/chan_vofr.c b/channels/chan_vofr.c
index 3d677bd3d4e0cea679706562799f6a083c7a052d..444701fd7d0b3be6d6134c7acb4b0a0f4fef3a15 100755 (executable)
--- a/channels/chan_vofr.c
+++ b/channels/chan_vofr.c
@@ -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 {

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 930a870fcab5a79d8aec2ccc3d7d3a7698693ef4..48675db0a0ddb2b6a8a33e6d7c469e2259026cbd 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -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);