From: Olle Johansson <oej@edvina.net>
Date: Sun, 6 Jul 2008 19:14:06 +0000 (+0000)
Subject: - Remove unused variable "expiry"
X-Git-Tag: 1.6.2.0-beta1~1756
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3586b6212db6300e04bb6aaf19512d594054cb36;p=thirdparty%2Fasterisk.git

- Remove unused variable "expiry"
- Set global_outboundproxy.force at reload.


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f22f6361ad..b71b21cd18 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -235,7 +235,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 static int min_expiry = DEFAULT_MIN_EXPIRY;        /*!< Minimum accepted registration time */
 static int max_expiry = DEFAULT_MAX_EXPIRY;        /*!< Maximum accepted registration time */
 static int default_expiry = DEFAULT_DEFAULT_EXPIRY;
-static int expiry = DEFAULT_EXPIRY;
 
 #ifndef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -20846,7 +20845,8 @@ static int reload_config(enum channelreloadreason reason)
 	memset(&default_prefs, 0 , sizeof(default_prefs));
 	memset(&global_outboundproxy, 0, sizeof(struct sip_proxy));
 	global_outboundproxy.ip.sin_port = htons(STANDARD_SIP_PORT);
-	global_outboundproxy.ip.sin_family = AF_INET;	/* Type of address: IPv4 */
+	global_outboundproxy.ip.sin_family = AF_INET;	/*!< Type of address: IPv4 */
+	global_outboundproxy.force = FALSE;		/*!< Don't force proxy usage, use route: headers */
 	ourport_tcp = STANDARD_SIP_PORT;
 	ourport_tls = STANDARD_TLS_PORT;
 	bindaddr.sin_port = htons(STANDARD_SIP_PORT);
@@ -20868,7 +20868,6 @@ static int reload_config(enum channelreloadreason reason)
 	allow_external_domains = DEFAULT_ALLOW_EXT_DOM;				/* Allow external invites */
 	global_regcontext[0] = '\0';
 	global_regextenonqualify = DEFAULT_REGEXTENONQUALIFY;
-	expiry = DEFAULT_EXPIRY;
 	global_notifyringing = DEFAULT_NOTIFYRINGING;
 	global_notifyhold = FALSE;		/*!< Keep track of hold status for a peer */
 	global_directrtpsetup = FALSE;		/* Experimental feature, disabled by default */