[Asterisk-cvs] asterisk/channels chan_mgcp.c,1.34.2.1,1.34.2.2 chan_sip.c,1.292.2.18,1.292.2.19 chan_skinny.c,1.27.2.1,1.27.2.2 chan_vofr.c,1.12.2.1,1.12.2.2 chan_zap.c,1.171.2.15,1.171.2.16 chan_h323.c,1.31.2.1,1.31.2.2

[citats at lists.digium.com]

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

Modified Files:
      Tag: v1-0_stable
	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.34.2.1
retrieving revision 1.34.2.2
diff -u -d -r1.34.2.1 -r1.34.2.2
--- chan_mgcp.c	15 Mar 2004 07:53:02 -0000	1.34.2.1
+++ chan_mgcp.c	15 Mar 2004 09:14:36 -0000	1.34.2.2
@@ -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.292.2.18
retrieving revision 1.292.2.19
diff -u -d -r1.292.2.18 -r1.292.2.19
--- chan_sip.c	15 Mar 2004 07:53:02 -0000	1.292.2.18
+++ chan_sip.c	15 Mar 2004 09:14:36 -0000	1.292.2.19
@@ -5826,7 +5826,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.27.2.1
retrieving revision 1.27.2.2
diff -u -d -r1.27.2.1 -r1.27.2.2
--- chan_skinny.c	15 Mar 2004 07:53:02 -0000	1.27.2.1
+++ chan_skinny.c	15 Mar 2004 09:14:36 -0000	1.27.2.2
@@ -2436,7 +2436,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.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- chan_vofr.c	15 Mar 2004 07:53:02 -0000	1.12.2.1
+++ chan_vofr.c	15 Mar 2004 09:14:36 -0000	1.12.2.2
@@ -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.171.2.15
retrieving revision 1.171.2.16
diff -u -d -r1.171.2.15 -r1.171.2.16
--- chan_zap.c	15 Mar 2004 07:53:02 -0000	1.171.2.15
+++ chan_zap.c	15 Mar 2004 09:14:36 -0000	1.171.2.16
@@ -5168,7 +5168,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.31.2.1
retrieving revision 1.31.2.2
diff -u -d -r1.31.2.1 -r1.31.2.2
--- chan_h323.c	15 Mar 2004 07:53:02 -0000	1.31.2.1
+++ chan_h323.c	15 Mar 2004 09:14:36 -0000	1.31.2.2
@@ -1270,7 +1270,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 {