aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcitats <citats@f38db490-d61c-443f-a65b-d21fe96a405b>2004-03-15 09:14:16 +0000
committercitats <citats@f38db490-d61c-443f-a65b-d21fe96a405b>2004-03-15 09:14:16 +0000
commit66a2c925b565c8469f997ad5ef0f6f642e174b6f (patch)
treed656231155fa5ab484310bf72e1e9650cd08b124
parentecede97dc4fc7e46f288729b4655598b91bdb3ff (diff)
Fixup some pthread_t checking in channels
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2438 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xchannels/chan_h323.c2
-rwxr-xr-xchannels/chan_mgcp.c2
-rwxr-xr-xchannels/chan_sip.c2
-rwxr-xr-xchannels/chan_skinny.c2
-rwxr-xr-xchannels/chan_vofr.c2
-rwxr-xr-xchannels/chan_zap.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 70761d883..afecf0f3d 100755
--- 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 1554b3365..f1fa9dec8 100755
--- 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 bcf9ff9a2..7af447007 100755
--- 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 0a01bdc57..cccb8429c 100755
--- 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 3d677bd3d..444701fd7 100755
--- 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 930a870fc..48675db0a 100755
--- 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);