kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

eliminate old chan->pvt field, and fix bug in generic bridge to watch chan->tech_pvt instead

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-09-01 00:10:49 +00:00
parent fc91dd1035
commit e04ba4a11f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channel.c
View File

@@ -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 */

2
include/asterisk/channel.h
View File

@@ -289,8 +289,6 @@ struct ast_channel {
char dtmfq[AST_MAX_EXTENSION];
/*! DTMF frame */
struct ast_frame dtmff;
/*! Private channel implementation details */
struct ast_channel_pvt *pvt;
/*! PBX private structure */
struct ast_pbx *pbx;