[Asterisk-cvs] asterisk/channels chan_mgcp.c,1.36,1.37 chan_sip.c,1.309,1.310 chan_skinny.c,1.31,1.32 chan_vofr.c,1.13,1.14 chan_zap.c,1.191,1.192 chan_h323.c,1.34,1.35

[citats at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv10976/channels

Modified Files:
	chan_mgcp.c chan_sip.c chan_skinny.c chan_vofr.c chan_zap.c 
	chan_h323.c 
Log Message:
Fixup some pthread_t checking in channels


Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- chan_mgcp.c	15 Mar 2004 07:51:22 -0000	1.36
+++ chan_mgcp.c	15 Mar 2004 09:14:16 -0000	1.37
@@ -2569,7 +2569,7 @@
 		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: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
--- chan_sip.c	15 Mar 2004 07:51:22 -0000	1.309
+++ chan_sip.c	15 Mar 2004 09:14:16 -0000	1.310
@@ -5829,7 +5829,7 @@
 		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: chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- chan_skinny.c	15 Mar 2004 07:51:22 -0000	1.31
+++ chan_skinny.c	15 Mar 2004 09:14:16 -0000	1.32
@@ -2426,7 +2426,7 @@
 		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: chan_vofr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_vofr.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- chan_vofr.c	15 Mar 2004 07:51:22 -0000	1.13
+++ chan_vofr.c	15 Mar 2004 09:14:16 -0000	1.14
@@ -1008,7 +1008,7 @@
 		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: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- chan_zap.c	15 Mar 2004 07:51:22 -0000	1.191
+++ chan_zap.c	15 Mar 2004 09:14:16 -0000	1.192
@@ -5182,7 +5182,7 @@
 		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);

Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- chan_h323.c	15 Mar 2004 07:51:22 -0000	1.34
+++ chan_h323.c	15 Mar 2004 09:14:16 -0000	1.35
@@ -1271,7 +1271,7 @@
 		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 {