aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-24 20:36:35 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-24 20:36:35 +0000
commit8ff9b62096247b64b17690bc738932cefe5805ac (patch)
tree8c728fe33a8afa397fb7c047b80c9b08a6f458ee
parent7eec89465a55ef3ab96b5c489e35c8abc018a75e (diff)
Merged revisions 283493 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r283493 | dvossel | 2010-08-24 15:34:03 -0500 (Tue, 24 Aug 2010) | 2 lines Changes the default behavior for sip.conf's pedantic option from "no" to "yes". ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@283494 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--UPGRADE-1.8.txt3
-rw-r--r--channels/sip/include/sip.h2
-rw-r--r--configs/sip.conf.sample2
3 files changed, 5 insertions, 2 deletions
diff --git a/UPGRADE-1.8.txt b/UPGRADE-1.8.txt
index 9202cfb10..9889a55e6 100644
--- a/UPGRADE-1.8.txt
+++ b/UPGRADE-1.8.txt
@@ -114,6 +114,9 @@ From 1.6.2 to 1.8:
removal of this feature will hopefully be followed by a correct RFC compliant
STUN implementation in chan_sip in the future.
+* The default value for the pedantic option in sip.conf has been changed
+ from "no" to "yes".
+
From 1.6.1 to 1.6.2:
* SIP no longer sends the 183 progress message for early media by
diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h
index cf3c0da69..11996f690 100644
--- a/channels/sip/include/sip.h
+++ b/channels/sip/include/sip.h
@@ -209,7 +209,7 @@
#define DEFAULT_DOMAINSASREALM FALSE /*!< Use the domain option to guess the realm for registration and invite requests */
#define DEFAULT_NOTIFYRINGING TRUE /*!< Notify devicestate system on ringing state */
#define DEFAULT_NOTIFYCID DISABLED /*!< Include CID with ringing notifications */
-#define DEFAULT_PEDANTIC FALSE /*!< Avoid following SIP standards for dialog matching */
+#define DEFAULT_PEDANTIC TRUE /*!< Follow SIP standards for dialog matching */
#define DEFAULT_AUTOCREATEPEER FALSE /*!< Don't create peers automagically */
#define DEFAULT_MATCHEXTERNADDRLOCALLY FALSE /*!< Match extern IP locally default setting */
#define DEFAULT_QUALIFY FALSE /*!< Don't monitor devices */
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 287e3c52b..b0c7e8d32 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -215,7 +215,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
;pedantic=yes ; Enable checking of tags in headers,
; international character conversions in URIs
; and multiline formatted headers for strict
- ; SIP compatibility (defaults to "no")
+ ; SIP compatibility (defaults to "yes")
; See qos.tex or Quality of Service section of asterisk.pdf for a description of these parameters.
;tos_sip=cs3 ; Sets TOS for SIP packets.