Fix sneakiness of OEJ

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4221 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5b5498acd9e7b2856909dababa784157e690b888..11c48340b331cb46318a40b247c852d7b9234b77 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -129,7 +129,7 @@ static char default_fromdomain[AST_MAX_EXTENSION] = "";
 
 static char notifymime[AST_MAX_EXTENSION] = "application/simple-message-summary";
 
-static int srvlookup = 1;              /* SRV Lookup on or off. Default now on */
+static int srvlookup = 0;              /* SRV Lookup on or off. Default now on */
 
 static int pedanticsipchecking = 0;    /* Extra checking ?  Default off */
 

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 5ca5b78293339dcad8efd7902a5c47935c2f48a6..1a6c8046ce7f65a46b45d8e961dd2ecf750ee2d3 100755 (executable)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -45,6 +45,7 @@ srvlookup=yes                 ; Enable DNS SRV lookups on outbound calls
 ;maxexpirey=3600               ; Max length of incoming registration we allow
 ;defaultexpirey=120            ; Default length of incoming/outoing registration
 ;notifymimetype=text/plain     ; Allow overriding of mime type in MWI NOTIFY
+;checkmwi=10                   ; Default time between mailbox checks for peers
 ;videosupport=yes              ; Turn on support for SIP video
 
 ;disallow=all                  ; First disallow all codecs
@@ -66,11 +67,16 @@ srvlookup=yes                       ; Enable DNS SRV lookups on outbound calls
                                 ; yes = Always ignore info and assume NAT
                                 ; no = Use NAT mode only according to RFC3581 
                                 ; never = Never attempt NAT mode or RFC3581 support
-                               ; route = Assume NAT, don't send rport (work around more UNIDEN bugs)
-;promiscredir = no      ; If yes, allows 302 or REDIR to non-local SIP address
-;                       ; Note that promiscredir when redirects are made to the
-;                       ; local system will cause loops since SIP is incapable
-;                       ; of performing a "hairpin" call.
+                               ; route = Assume NAT, don't send rport 
+                               ; (work around more UNIDEN bugs)
+;promiscredir = no             ; If yes, allows 302 or REDIR to non-local SIP address
+                               ; Note that promiscredir when redirects are made to the
+                                       ; local system will cause loops since SIP is incapable
+                                       ; of performing a "hairpin" call.
+;dtmfmode = rfc2833            ; Set default dtmfmode for sending DTMF. Default: rfc2833
+                               ; Other options: 
+                               ; info : SIP INFO messages
+                               ; inband : Inband audio
 ;
 ; If regcontext is specified, Asterisk will dynamically 
 ; create and destroy a NoOp priority 1 extension for a given
@@ -79,7 +85,7 @@ srvlookup=yes                 ; Enable DNS SRV lookups on outbound calls
 ; name if 'regexten' is not provided.  More than one regexten may be supplied
 ; if they are separated by '&'.  Patterns may be used in regexten.
 ;
-;regcontext=iaxregistrations
+;regcontext=sipregistrations
 ;
 ; Asterisk can register as a SIP user agent to a SIP proxy (provider)
 ; Format for the register statement is: