[asterisk-commits] jpeeler: branch jpeeler/feature14882 r285008 - in /team/jpeeler/feature14882:...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Sep  3 17:55:57 2010
New Revision: 285008

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285008
Log:
sync with trunk

Modified:
    team/jpeeler/feature14882/   (props changed)
    team/jpeeler/feature14882/channels/chan_sip.c
    team/jpeeler/feature14882/channels/sip/include/sip.h
    team/jpeeler/feature14882/configs/sip.conf.sample

Propchange: team/jpeeler/feature14882/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/jpeeler/feature14882/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep  3 17:55:57 2010
@@ -1,1 +1,1 @@
-/trunk:1-284993
+/trunk:1-285007

Modified: team/jpeeler/feature14882/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/jpeeler/feature14882/channels/chan_sip.c?view=diff&rev=285008&r1=285007&r2=285008
==============================================================================
--- team/jpeeler/feature14882/channels/chan_sip.c (original)
+++ team/jpeeler/feature14882/channels/chan_sip.c Fri Sep  3 17:55:57 2010
@@ -26409,7 +26409,7 @@
 	sip_cfg.notifyhold = FALSE;		/*!< Keep track of hold status for a peer */
 	sip_cfg.directrtpsetup = FALSE;		/* Experimental feature, disabled by default */
 	sip_cfg.alwaysauthreject = DEFAULT_ALWAYSAUTHREJECT;
-	sip_cfg.auth_options_requests = 1;
+	sip_cfg.auth_options_requests = DEFAULT_AUTH_OPTIONS;
 	sip_cfg.allowsubscribe = FALSE;
 	sip_cfg.disallowed_methods = SIP_UNKNOWN;
 	sip_cfg.contact_ha = NULL;		/* Reset the contact ACL */
@@ -26652,8 +26652,8 @@
 		} else if (!strcasecmp(v->name, "alwaysauthreject")) {
 			sip_cfg.alwaysauthreject = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "auth_options_requests")) {
-			if (ast_false(v->value)) {
-				sip_cfg.auth_options_requests = 0;
+			if (ast_true(v->value)) {
+				sip_cfg.auth_options_requests = 1;
 			}
 		} else if (!strcasecmp(v->name, "mohinterpret")) {
 			ast_copy_string(default_mohinterpret, v->value, sizeof(default_mohinterpret));

Modified: team/jpeeler/feature14882/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/team/jpeeler/feature14882/channels/sip/include/sip.h?view=diff&rev=285008&r1=285007&r2=285008
==============================================================================
--- team/jpeeler/feature14882/channels/sip/include/sip.h (original)
+++ team/jpeeler/feature14882/channels/sip/include/sip.h Fri Sep  3 17:55:57 2010
@@ -207,6 +207,7 @@
 #define DEFAULT_QUALIFY        FALSE    /*!< Don't monitor devices */
 #define DEFAULT_CALLEVENTS     FALSE    /*!< Extra manager SIP call events */
 #define DEFAULT_ALWAYSAUTHREJECT  TRUE  /*!< Don't reject authentication requests always */
+#define DEFAULT_AUTH_OPTIONS  FALSE
 #define DEFAULT_REGEXTENONQUALIFY FALSE
 #define DEFAULT_T1MIN             100   /*!< 100 MS for minimal roundtrip time */
 #define DEFAULT_MAX_CALL_BITRATE (384)  /*!< Max bitrate for video */

Modified: team/jpeeler/feature14882/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/jpeeler/feature14882/configs/sip.conf.sample?view=diff&rev=285008&r1=285007&r2=285008
==============================================================================
--- team/jpeeler/feature14882/configs/sip.conf.sample (original)
+++ team/jpeeler/feature14882/configs/sip.conf.sample Fri Sep  3 17:55:57 2010
@@ -370,13 +370,8 @@
                                 ; the ability of an attacker to scan for valid SIP usernames.
                                 ; This option is set to "yes" by default.
 
-;auth_options_requests = no     ; sip OPTIONS requests should be treated the exact same as
-                                ; an INVITE, this includes performing authentication.  By default
-                                ; OPTIONS requests are authenticated, however this option allows
-                                ; OPTION requests to proceed unauthenticated in order to increase
-                                ; performance. This may be desirable if OPTIONS are only used to
-                                ; qualify the availabilty of the endpoint/extension.  Disabling
-                                ; this option is not recommended.
+;auth_options_requests = yes    ; Enabling this option will authenticate OPTIONS requests just like
+                                ; INVITE requests are.  By default this option is disabled.
 
 ;g726nonstandard = yes          ; If the peer negotiates G726-32 audio, use AAL2 packing
                                 ; order instead of RFC3551 packing order (this is required