diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-10 16:33:47 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-10 16:33:47 +0000 |
| commit | 3106171e09aacb05e745922a7c9c3205279ab7f8 (patch) | |
| tree | d2b1bd389c8b6aa63f15716a3fc92be8e1141bfd /channels/chan_sip.c | |
| parent | f794f23c8d590e13d40855ee4f15b615dc78fd51 (diff) | |
restore 'rfc2833' naming for DTMF mode in chan_sip
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9391 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 68f382e42..5b7c0401e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7747,7 +7747,7 @@ static const char *dtmfmode2str(int mode) { switch (mode) { case SIP_DTMF_RFC2833: - return "rtp"; + return "rfc2833"; case SIP_DTMF_INFO: return "info"; case SIP_DTMF_INBAND: @@ -11723,7 +11723,7 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask ast_clear_flag(flags, SIP_DTMF); if (!strcasecmp(v->value, "inband")) ast_set_flag(flags, SIP_DTMF_INBAND); - else if (!strcasecmp(v->value, "rfc2833") || !strcasecmp(v->value, "rtp")) + else if (!strcasecmp(v->value, "rfc2833")) ast_set_flag(flags, SIP_DTMF_RFC2833); else if (!strcasecmp(v->value, "info")) ast_set_flag(flags, SIP_DTMF_INFO); @@ -12848,7 +12848,7 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struc } static char *synopsis_dtmfmode = "Change the dtmfmode for a SIP call"; -static char *descrip_dtmfmode = "SIPDtmfMode(inband|info|rtp): Changes the dtmfmode for a SIP call\n"; +static char *descrip_dtmfmode = "SIPDtmfMode(inband|info|rfc2833): Changes the dtmfmode for a SIP call\n"; static char *app_dtmfmode = "SIPDtmfMode"; static char *app_sipaddheader = "SIPAddHeader"; @@ -12871,7 +12871,7 @@ static int sip_dtmfmode(struct ast_channel *chan, void *data) if (data) mode = (char *)data; else { - ast_log(LOG_WARNING, "This application requires the argument: info, inband, rtp\n"); + ast_log(LOG_WARNING, "This application requires the argument: info, inband, rfc2833\n"); return 0; } ast_mutex_lock(&chan->lock); @@ -12889,10 +12889,10 @@ static int sip_dtmfmode(struct ast_channel *chan, void *data) if (!strcasecmp(mode,"info")) { ast_clear_flag(p, SIP_DTMF); ast_set_flag(p, SIP_DTMF_INFO); - } else if (!strcasecmp(mode, "rfc2833") || !strcasecmp(mode, "rtp")) { + } else if (!strcasecmp(mode,"rfc2833")) { ast_clear_flag(p, SIP_DTMF); ast_set_flag(p, SIP_DTMF_RFC2833); - } else if (!strcasecmp(mode, "inband")) { + } else if (!strcasecmp(mode,"inband")) { ast_clear_flag(p, SIP_DTMF); ast_set_flag(p, SIP_DTMF_INBAND); } else |