dect/asterisk
Archived
14
0
Fork 0
Code Releases Activity

- Change "rfc2833" to "rtp" in sip.conf. Keeping backwards compatibility.

Browse source 
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9294 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
oej 2006-02-09 15:40:53 +00:00
parent d631197090
commit eec98d0bea
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
channels/chan_sip.c
View file

@ -7747,7 +7747,7 @@ static const char *dtmfmode2str(int mode)
{ {
switch (mode) { switch (mode) {
case SIP_DTMF_RFC2833: case SIP_DTMF_RFC2833:
return "rfc2833"; return "rtp";
case SIP_DTMF_INFO: case SIP_DTMF_INFO:
return "info"; return "info";
case SIP_DTMF_INBAND: 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); ast_clear_flag(flags, SIP_DTMF);
if (!strcasecmp(v->value, "inband")) if (!strcasecmp(v->value, "inband"))
ast_set_flag(flags, SIP_DTMF_INBAND); ast_set_flag(flags, SIP_DTMF_INBAND);
else if (!strcasecmp(v->value, "rfc2833")) else if (!strcasecmp(v->value, "rfc2833") || !strcasecmp(v->value, "rtp"))
ast_set_flag(flags, SIP_DTMF_RFC2833); ast_set_flag(flags, SIP_DTMF_RFC2833);
else if (!strcasecmp(v->value, "info")) else if (!strcasecmp(v->value, "info"))
ast_set_flag(flags, SIP_DTMF_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 *synopsis_dtmfmode = "Change the dtmfmode for a SIP call";
static char *descrip_dtmfmode = "SIPDtmfMode(inband|info|rfc2833): Changes the dtmfmode for a SIP call\n"; static char *descrip_dtmfmode = "SIPDtmfMode(inband|info|rtp): Changes the dtmfmode for a SIP call\n";
static char *app_dtmfmode = "SIPDtmfMode"; static char *app_dtmfmode = "SIPDtmfMode";
static char *app_sipaddheader = "SIPAddHeader"; static char *app_sipaddheader = "SIPAddHeader";
@ -12871,7 +12871,7 @@ static int sip_dtmfmode(struct ast_channel *chan, void *data)
if (data) if (data)
mode = (char *)data; mode = (char *)data;
else { else {
ast_log(LOG_WARNING, "This application requires the argument: info, inband, rfc2833\n"); ast_log(LOG_WARNING, "This application requires the argument: info, inband, rtp\n");
return 0; return 0;
} }
ast_mutex_lock(&chan->lock); ast_mutex_lock(&chan->lock);
@ -12889,10 +12889,10 @@ static int sip_dtmfmode(struct ast_channel *chan, void *data)
if (!strcasecmp(mode,"info")) { if (!strcasecmp(mode,"info")) {
ast_clear_flag(p, SIP_DTMF); ast_clear_flag(p, SIP_DTMF);
ast_set_flag(p, SIP_DTMF_INFO); ast_set_flag(p, SIP_DTMF_INFO);
} else if (!strcasecmp(mode,"rfc2833")) { } else if (!strcasecmp(mode, "rfc2833") || !strcasecmp(mode, "rtp")) {
ast_clear_flag(p, SIP_DTMF); ast_clear_flag(p, SIP_DTMF);
ast_set_flag(p, SIP_DTMF_RFC2833); ast_set_flag(p, SIP_DTMF_RFC2833);
} else if (!strcasecmp(mode,"inband")) { } else if (!strcasecmp(mode, "inband")) {
ast_clear_flag(p, SIP_DTMF); ast_clear_flag(p, SIP_DTMF);
ast_set_flag(p, SIP_DTMF_INBAND); ast_set_flag(p, SIP_DTMF_INBAND);
} else } else

13
configs/sip.conf.sample
View file

@ -96,11 +96,12 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; of performing a "hairpin" call. ; of performing a "hairpin" call.
;usereqphone = no ; If yes, ";user=phone" is added to uri that contains ;usereqphone = no ; If yes, ";user=phone" is added to uri that contains
; a valid phone number ; a valid phone number
;dtmfmode = rfc2833 ; Set default dtmfmode for sending DTMF. Default: rfc2833 ;dtmfmode = rtp ; Set default dtmfmode for sending DTMF. Default is rtp (according to RFC 2833)
; Other options: ; Other options:
; info : SIP INFO messages ; info SIP INFO messages
; inband : Inband audio (requires 64 kbit codec -alaw, ulaw) ; inband Inband audio
; auto : Use rfc2833 if offered, inband otherwise ; (requires 64 kbit codec -alaw, ulaw)
; auto : Use rtp if offered, inband otherwise
;compactheaders = yes ; send compact sip headers. ;compactheaders = yes ; send compact sip headers.
;sipdebug = yes ; Turn on SIP debugging by default, from ;sipdebug = yes ; Turn on SIP debugging by default, from
@ -412,7 +413,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
;subscribecontext=localextensions ; Only allow SUBSCRIBE for local extensions ;subscribecontext=localextensions ; Only allow SUBSCRIBE for local extensions
;language=de ; Use German prompts for this user ;language=de ; Use German prompts for this user
;host=dynamic ; This peer register with us ;host=dynamic ; This peer register with us
;dtmfmode=inband ; Choices are inband, rfc2833, or info ;dtmfmode=inband ; Choices are inband, rtp, or info
;defaultip=192.168.0.59 ; IP used until peer registers ;defaultip=192.168.0.59 ; IP used until peer registers
;mailbox=1234@context,2345 ; Mailbox(-es) for message waiting indicator ;mailbox=1234@context,2345 ; Mailbox(-es) for message waiting indicator
;vmexten=voicemail ; dialplan extension to reach mailbox ;vmexten=voicemail ; dialplan extension to reach mailbox
@ -428,7 +429,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
;context=from-sip ; Context for incoming calls from this user ;context=from-sip ; Context for incoming calls from this user
;secret=blahpoly ;secret=blahpoly
;host=dynamic ; This peer register with us ;host=dynamic ; This peer register with us
;dtmfmode=rfc2833 ; Choices are inband, rfc2833, or info ;dtmfmode=rtp ; Choices are inband, rtp, or info
;username=polly ; Username to use in INVITE until peer registers ;username=polly ; Username to use in INVITE until peer registers
; Normally you do NOT need to set this parameter ; Normally you do NOT need to set this parameter
;disallow=all ;disallow=all