diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-13 13:11:13 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-13 13:11:13 +0000 |
| commit | 4bd3402e5a6f3102cfa53cd2cef24feaf55e9cb0 (patch) | |
| tree | 928064befacf46046ff2b6ec2e1d9928a015db79 /channels/chan_misdn.c | |
| parent | 2c87ee378c2846e8e02fb4c4c404535458e9823a (diff) | |
fixed some echocandisable issues when bridged. this caused a kernel panic sometimes..also some minor formatting fixes
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@45020 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_misdn.c')
| -rw-r--r-- | channels/chan_misdn.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 2fddfe3d5..6c1de400f 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2287,7 +2287,6 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0, carr[0]=c0; carr[1]=c1; - if (ch1 && ch2 ) ; else return -1; @@ -2309,10 +2308,9 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0, ch2->bc->ec_enable=0; manager_ec_disable(ch2->bc); } - /* trying to make a mISDN_dsp conference */ chan_misdn_log(1, ch1->bc->port, "I SEND: Making conference with Number:%d\n", ch1->bc->pid +1); - + misdn_lib_bridge(ch1->bc,ch2->bc); } @@ -2358,7 +2356,11 @@ enum ast_bridge_result misdn_bridge (struct ast_channel *c0, break; } - + if (f->frametype == AST_FRAME_VOICE) { + chan_misdn_log(1,0,"Got Voice frame in Bridged state..\n"); + continue; + } + if (who == c0) { ast_write(c1,f); } |