From: Olle Johansson Date: Mon, 7 Sep 2009 11:55:00 +0000 (+0000) Subject: Turning off premature media by default X-Git-Tag: 1.6.1.7-rc1~44 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f8e1620eb314b2fee89e43aedd3ed5146fcbe70;p=thirdparty%2Fasterisk.git Turning off premature media by default git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@216653 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/CHANGES b/CHANGES index f441ea0a8a..4d456895b4 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,12 @@ === ====================================================================== +SIP changes +----------- + * Added a new option "prematuremedia" that defaults to "no". If you turn this + option on, chan_sip will not automatically initiate early media if it receives + audio from the incoming channel before there's been a progress indication. + ---------------------------------------------------------------------------------- --- Functionality changes from Asterisk 1.6.1.1 to Asterisk 1.6.1.2 ------------- ---------------------------------------------------------------------------------- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e2848bbd17..62d2e8a04c 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -18705,7 +18705,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int st_interval = uac_max_se; } } else { - st_interval = uac_min_se; + st_interval = global_max_se; } break; @@ -22721,7 +22721,7 @@ static int reload_config(enum channelreloadreason reason) snprintf(global_useragent, sizeof(global_useragent), "%s %s", DEFAULT_USERAGENT, ast_get_version()); snprintf(global_sdpsession, sizeof(global_sdpsession), "%s %s", DEFAULT_SDPSESSION, ast_get_version()); snprintf(global_sdpowner, sizeof(global_sdpowner), "%s", DEFAULT_SDPOWNER); - global_prematuremediafilter = TRUE; + global_prematuremediafilter = FALSE; ast_copy_string(default_notifymime, DEFAULT_NOTIFYMIME, sizeof(default_notifymime)); ast_copy_string(global_realm, S_OR(ast_config_AST_SYSTEM_NAME, DEFAULT_REALM), sizeof(global_realm)); ast_copy_string(default_callerid, DEFAULT_CALLERID, sizeof(default_callerid));