From e167cc89f8cb8ea660120da2f81bccd13fe1b286 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Fri, 16 Jul 2004 02:24:57 +0000 Subject: [PATCH] Fix native zap bridging with GR-303 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3443 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index e6e331f022..ccb534f2c2 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -1143,7 +1143,7 @@ static int update_conf(struct zt_pvt *p) for (x=0;xslaves[x]) { if (useslavenative) - conf_add(p, &p->slaves[x]->subs[SUB_REAL], SUB_REAL, p->channel); + conf_add(p, &p->slaves[x]->subs[SUB_REAL], SUB_REAL, p->bearer ? p->bearer->channel : p->channel); else { conf_add(p, &p->slaves[x]->subs[SUB_REAL], SUB_REAL, 0); needconf++; @@ -1153,7 +1153,7 @@ static int update_conf(struct zt_pvt *p) /* 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->channel); + conf_add(p, &p->subs[SUB_REAL], SUB_REAL, slave->bearer ? slave->bearer->channel : slave->channel); else { conf_add(p, &p->subs[SUB_REAL], SUB_REAL, 0); needconf++; @@ -1162,7 +1162,7 @@ static int update_conf(struct zt_pvt *p) /* 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->channel); + conf_add(p->master, &p->subs[SUB_REAL], SUB_REAL, p->master->bearer ? p->master->bearer->channel : p->master->channel); } else { conf_add(p->master, &p->subs[SUB_REAL], SUB_REAL, 0); }