kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix native zap bridging with GR-303

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3443 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-07-16 02:24:57 +00:00
parent 05d3d9c25f
commit e167cc89f8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_zap.c
View File

@@ -1143,7 +1143,7 @@ static int update_conf(struct zt_pvt *p)
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->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);
}