[svn-commits] oej: branch 1.6.0 r128523 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: oej
Date: Sun Jul  6 14:56:10 2008
New Revision: 128523

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128523
Log:
Merged revisions 128491 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r128491 | oej | 2008-07-06 21:14:06 +0200 (Sön, 06 Jul 2008) | 3 lines

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

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=128523&r1=128522&r2=128523
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Sun Jul  6 14:56:10 2008
@@ -213,7 +213,6 @@
 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))
@@ -20376,7 +20375,8 @@
 	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);
@@ -20398,7 +20398,6 @@
 	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_limitonpeers = FALSE;		/*!< Match call limit on peers only */
 	global_notifyhold = FALSE;		/*!< Keep track of hold status for a peer */