From: Mark Spencer <markster@digium.com>
Date: Fri, 13 Aug 2004 13:19:29 +0000 (+0000)
Subject: Don't request tones when in-band DTMF mode is enabled (bug #2248)
X-Git-Tag: 1.0.0~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e85d440f88be8b3099a74e59065a0abc44acf31f;p=thirdparty%2Fasterisk.git

Don't request tones when in-band DTMF mode is enabled (bug #2248)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3605 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index b69f02cab3..c0fd5a7d6b 100755
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -2002,7 +2002,7 @@ static int transmit_notify_request(struct mgcp_subchannel *sub, char *tone)
             add_header(&resp, "R", "L/hd(N)");
             break;
         case MGCP_OFFHOOK:
-            add_header(&resp, "R", "L/hu(N), L/hf(N), D/[0-9#*](N)");
+            add_header(&resp, "R", (p->dtmfmode & MGCP_DTMF_INBAND) ? "L/hu(N),L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)");
             break;
     }
     if (strlen(tone)) {
@@ -2056,7 +2056,7 @@ static int transmit_notify_request_with_callerid(struct mgcp_subchannel *sub, ch
             add_header(&resp, "R", "L/hd(N)");
             break;
         case MGCP_OFFHOOK:
-            add_header(&resp, "R", "L/hu(N),L/hf(N),D/[0-9#*](N)");
+            add_header(&resp, "R",  (p->dtmfmode & MGCP_DTMF_INBAND) ? "L/hu(N),L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)");
             break;
     }
     if (strlen(tone2)) {
@@ -2096,7 +2096,7 @@ static int transmit_modify_request(struct mgcp_subchannel *sub)
             add_header(&resp, "R", "L/hd(N)");
             break;
         case MGCP_OFFHOOK:
-            add_header(&resp, "R", "L/hu(N),L/hf(N),D/[0-9#*](N)");
+            add_header(&resp, "R",  (p->dtmfmode & MGCP_DTMF_INBAND) ? "L/hu(N), L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)");
             break;
     }
     /* SC: fill in new fields */