[Asterisk-cvs] asterisk/apps app_meetme.c,1.18,1.19

[markster at lists.digium.com]

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

Modified Files:
	app_meetme.c 
Log Message:
Implement temporary work around for pseudo channels with SMP


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- app_meetme.c	14 Jan 2004 06:04:46 -0000	1.18
+++ app_meetme.c	5 Feb 2004 22:28:44 -0000	1.19
@@ -482,6 +482,19 @@
 		}
 	}
 
+#ifndef NO_ZAPTEL_PANIC_WORKAROUND
+	/* Take out of conference */
+	/* Add us to the conference */
+	ztc.chan = 0;	
+	ztc.confno = 0;
+	ztc.confmode = 0;
+	if (ioctl(fd, ZT_SETCONF, &ztc)) {
+		ast_log(LOG_WARNING, "Error setting conference\n");
+	}
+	usleep(1);
+	if (fd != chan->fds[0])
+		close(fd);
+#else		
 	if (fd != chan->fds[0])
 		close(fd);
 	else {
@@ -494,7 +507,7 @@
 			ast_log(LOG_WARNING, "Error setting conference\n");
 		}
 	}
-
+#endif
 	if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
 		conf_play(conf, LEAVE);