diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-09-01 00:10:49 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-09-01 00:10:49 +0000 |
commit | e04ba4a11f62d78ae62c217a4452db7372272950 (patch) | |
tree | 5aa93ec92fd92bdce21f09c68469a253a6918e6a /channel.c | |
parent | fc91dd1035f5f33f14b397c89b79f11bb91ca079 (diff) |
eliminate old chan->pvt field, and fix bug in generic bridge to watch chan->tech_pvt instead
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channel.c')
-rwxr-xr-x | channel.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -2895,25 +2895,25 @@ static enum ast_bridge_result ast_generic_bridge(int *playitagain, int *playit, int to; struct ast_frame *f; struct ast_channel *who = NULL; - void *pvt0, *pvt1; enum ast_bridge_result res = AST_BRIDGE_COMPLETE; int o0nativeformats; int o1nativeformats; long elapsed_ms=0, time_left_ms=0; int watch_c0_dtmf; int watch_c1_dtmf; + void *pvt0, *pvt1; cs[0] = c0; cs[1] = c1; - pvt0 = c0->pvt; - pvt1 = c1->pvt; + pvt0 = c0->tech_pvt; + pvt1 = c1->tech_pvt; o0nativeformats = c0->nativeformats; o1nativeformats = c1->nativeformats; watch_c0_dtmf = config->flags & AST_BRIDGE_DTMF_CHANNEL_0; watch_c1_dtmf = config->flags & AST_BRIDGE_DTMF_CHANNEL_1; for (;;) { - if ((c0->pvt != pvt0) || (c1->pvt != pvt1) || + if ((c0->tech_pvt != pvt0) || (c1->tech_pvt != pvt1) || (o0nativeformats != c0->nativeformats) || (o1nativeformats != c1->nativeformats)) { /* Check for Masquerade, codec changes, etc */ |