Merged revisions 58779 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58779 | file | 2007-03-11 20:51:16 -0400 (Sun, 11 Mar 2007) | 2 lines

Add matchexterniplocally setting which only substitutes your externip/externhost setting if it matches the localnet setting. I know of at least two people who need opposite settings, so I made it an option! (issue #8821 reported by kokoskarokoska)

........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index efc1142cce606d17ed3891808db7a17b7a8158c1..52030e7b3f0c493088367f5f480fea01f922ea44 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -578,6 +578,8 @@ static int global_autoframing;          /*!< Turn autoframing on or off. */
 static enum transfermodes global_allowtransfer;        /*!< SIP Refer restriction scheme */
 static struct sip_proxy global_outboundproxy;  /*!< Outbound proxy */
 
+static int global_matchexterniplocally; /*!< Match externip/externhost setting against localnet setting */
+
 /*! \brief Codecs that we support by default: */
 static int global_capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
 
@@ -1935,7 +1937,7 @@ static enum sip_result ast_sip_ouraddrfor(struct in_addr *them, struct in_addr *
 
        if (localaddr && externip.sin_addr.s_addr &&
            (ast_apply_ha(localaddr, &theirs)) &&
-           (!ast_apply_ha(localaddr, &ours))) {
+           (!global_matchexterniplocally || !ast_apply_ha(localaddr, &ours))) {
                if (externexpire && time(NULL) >= externexpire) {
                        struct ast_hostent ahp;
                        struct hostent *hp;
@@ -16936,6 +16938,8 @@ static int reload_config(enum channelreloadreason reason)
        global_callevents = FALSE;
        global_t1min = DEFAULT_T1MIN;           
 
+       global_matchexterniplocally = FALSE;
+
        /* Copy the default jb config over global_jbconf */
        memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
 
@@ -17187,6 +17191,8 @@ static int reload_config(enum channelreloadreason reason)
                        default_maxcallbitrate = atoi(v->value);
                        if (default_maxcallbitrate < 0)
                                default_maxcallbitrate = DEFAULT_MAX_CALL_BITRATE;
+               } else if (!strcasecmp(v->name, "matchexterniplocally")) {
+                       global_matchexterniplocally = ast_true(v->value);
                }
        }
 

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index d249565908784c52909753f073dd7b520b0e2e94..45890126d59b1cdaf6218b5628037dea21295330 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -148,10 +148,12 @@ srvlookup=yes                     ; Enable DNS SRV lookups on outbound calls
                                ; for Sipura and Grandstream ATAs, among others). This is
                                ; contrary to the RFC3551 specification, the peer _should_
                                ; be negotiating AAL2-G726-32 instead :-(
-
 ;outboundproxy=proxy.provider.domain           ; send outbound signaling to this proxy, not directly to the devices
 ;outboundproxy=proxy.provider.domain:8080       ; send outbound signaling to this proxy, not directly to the devices
 ;outboundproxy=proxy.provider.domain,force      ; Send ALL outbound signalling to proxy, ignoring route: headers
+;matchexterniplocally = yes     ; Only substitute the externip or externhost setting if it matches
+                                ; your localnet setting. Unless you have some sort of strange network
+                                ; setup you will not need to enable this.
 
 ;
 ; If regcontext is specified, Asterisk will dynamically create and destroy a