[Asterisk-cvs] asterisk/channels chan_zap.c,1.296,1.297

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory localhost.localdomain:/tmp/cvs-serv13448/channels

Modified Files:
	chan_zap.c 
Log Message:
Don't look for bearers when there are none.


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- chan_zap.c	16 Jul 2004 20:51:54 -0000	1.296
+++ chan_zap.c	16 Jul 2004 22:15:30 -0000	1.297
@@ -544,6 +544,12 @@
 #endif	
 } *iflist = NULL, *ifend = NULL;
 
+#ifdef ZAPATA_PRI
+#define GET_CHANNEL(p) ((p)->bearer ? (p)->bearer->channel : p->channel)
+#else
+#define GET_CHANNEL(p) ((p)->channel)
+#endif
+
 struct zt_pvt *round_robin[32];
 
 #ifdef ZAPATA_PRI
@@ -1143,7 +1149,7 @@
 	for (x=0;x<MAX_SLAVES;x++) {
 		if (p->slaves[x]) {
 			if (useslavenative)
-				conf_add(p, &p->slaves[x]->subs[SUB_REAL], SUB_REAL, p->bearer ? p->bearer->channel : p->channel);
+				conf_add(p, &p->slaves[x]->subs[SUB_REAL], SUB_REAL, GET_CHANNEL(p));
 			else {
 				conf_add(p, &p->slaves[x]->subs[SUB_REAL], SUB_REAL, 0);
 				needconf++;
@@ -1153,7 +1159,7 @@
 	/* If we're supposed to be in there, do so now */
 	if (p->inconference && !p->subs[SUB_REAL].inthreeway) {
 		if (useslavenative)
-			conf_add(p, &p->subs[SUB_REAL], SUB_REAL, slave->bearer ? slave->bearer->channel : slave->channel);
+			conf_add(p, &p->subs[SUB_REAL], SUB_REAL, GET_CHANNEL(slave));
 		else {
 			conf_add(p, &p->subs[SUB_REAL], SUB_REAL, 0);
 			needconf++;
@@ -1162,7 +1168,7 @@
 	/* If we have a master, add ourselves to his conference */
 	if (p->master) {
 		if (isslavenative(p->master, NULL)) {
-			conf_add(p->master, &p->subs[SUB_REAL], SUB_REAL, p->master->bearer ? p->master->bearer->channel : p->master->channel);
+			conf_add(p->master, &p->subs[SUB_REAL], SUB_REAL, GET_CHANNEL(p->master));
 		} else {
 			conf_add(p->master, &p->subs[SUB_REAL], SUB_REAL, 0);
 		}