diff options
author | Mark Spencer <markster@digium.com> | 2003-10-06 04:59:49 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2003-10-06 04:59:49 +0000 |
commit | 9efec3dff4ac34b546c1d980c33467f6860fb59e (patch) | |
tree | 028b00b8733096d8d68f2796484cf215abae6ef4 | |
parent | 285d3a44972222cea25e17336c48f8b732b1f436 (diff) |
Detect 100 as valid DTMF too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | channels/chan_iax2.c | 6 | ||||
-rwxr-xr-x | rtp.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 3dd364fea..10fa823b7 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -379,6 +379,9 @@ struct chan_iax2_pvt { /* Who we are bridged to */ unsigned short bridgecallno; + unsigned int bridgesfmt; + struct ast_trans_pvt *bridgetrans; + int pingid; /* Transmit PING request */ int lagid; /* Retransmit lag request */ int autoid; /* Auto hangup for Dialplan requestor */ @@ -1034,6 +1037,9 @@ retry: pvt->lagid = -1; pvt->autoid = -1; pvt->initid = -1; + if (pvt->bridgetrans) + ast_translator_free_path(p->bridgetrans); + pvt->bridgetrans = NULL; /* Already gone */ pvt->alreadygone = 1; @@ -546,6 +546,7 @@ static struct rtpPayloadType static_RTP_PT[MAX_RTP_PT] = { [31] = {1, AST_FORMAT_H261}, [34] = {1, AST_FORMAT_H263}, [97] = {1, AST_FORMAT_ILBC}, + [100] = {0, AST_RTP_DTMF}, [101] = {0, AST_RTP_DTMF}, [110] = {1, AST_FORMAT_SPEEX}, [121] = {0, AST_RTP_CISCO_DTMF}, // Must be type 121 |