[asterisk-commits] oej: branch 1.6.1 r216653 - in /branches/1.6.1: CHANGES channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Sep  7 06:55:00 2009
New Revision: 216653

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=216653
Log:
Turning off premature media by default

Modified:
    branches/1.6.1/CHANGES
    branches/1.6.1/channels/chan_sip.c

Modified: branches/1.6.1/CHANGES
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/CHANGES?view=diff&rev=216653&r1=216652&r2=216653
==============================================================================
--- branches/1.6.1/CHANGES (original)
+++ branches/1.6.1/CHANGES Mon Sep  7 06:55:00 2009
@@ -7,6 +7,12 @@
 === and the other UPGRADE files for older releases.
 ===
 ======================================================================
+
+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  -------------

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=216653&r1=216652&r2=216653
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Mon Sep  7 06:55:00 2009
@@ -18705,7 +18705,7 @@
 					st_interval = uac_max_se;
 				}
 			} else {
-				st_interval = uac_min_se;
+				st_interval = global_max_se;
 			}
 			break;
 
@@ -22721,7 +22721,7 @@
 	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));