From 4ffa6c246f614a3b01731f4215b3cb7ad5ed987f Mon Sep 17 00:00:00 2001 From: Mark Spencer <markster@digium.com> Date: Fri, 24 Sep 2004 19:21:24 +0000 Subject: [PATCH] If no RTP stream is up, always request digits (bug #2492) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3831 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_mgcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 171b72297d..22058c7752 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -2006,7 +2006,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", (p->dtmfmode & MGCP_DTMF_INBAND) ? "L/hu(N),L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"); + add_header(&resp, "R", (sub->rtp && (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)) { @@ -2060,7 +2060,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", (p->dtmfmode & MGCP_DTMF_INBAND) ? "L/hu(N),L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"); + add_header(&resp, "R", (sub->rtp && (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)) { @@ -2100,7 +2100,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", (p->dtmfmode & MGCP_DTMF_INBAND) ? "L/hu(N), L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"); + add_header(&resp, "R", (sub->rtp && (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 */ -- GitLab