aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-08-13 13:19:29 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-08-13 13:19:29 +0000
commit41406abb7a733d99555171650f6befa220c9d567 (patch)
treec4a04886ac4d5284b65ac84c784e6c3040efbea8
parent82a124c6674675bca0d4235258d48226f5b97b73 (diff)
Don't request tones when in-band DTMF mode is enabled (bug #2248)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3605 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xchannels/chan_mgcp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index b69f02cab..c0fd5a7d6 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 */