Detect 100 as valid DTMF too
authorMark Spencer <markster@digium.com>
Mon, 6 Oct 2003 04:59:49 +0000 (04:59 +0000)
committerMark Spencer <markster@digium.com>
Mon, 6 Oct 2003 04:59:49 +0000 (04:59 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1612 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c
rtp.c

index 3dd364f..10fa823 100755 (executable)
@@ -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;
diff --git a/rtp.c b/rtp.c
index bd29e04..d816f8d 100755 (executable)
--- a/rtp.c
+++ b/rtp.c
@@ -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