diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-16 02:24:57 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-16 02:24:57 +0000 |
| commit | 4ced1e0c7c42ab67071dc879cc4086618ac50d3a (patch) | |
| tree | 7779be095c996b4005e58f64defdb22cf9fdfc51 | |
| parent | 20d281392276ca8a5486681da1c7c5edfdb53b65 (diff) | |
Fix native zap bridging with GR-303
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3443 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | channels/chan_zap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index e6e331f02..ccb534f2c 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;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); } |