diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-06 19:56:10 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-06 19:56:10 +0000 |
| commit | 61883d0091482ab24735e955de7a6328fb9f08a4 (patch) | |
| tree | c1249433e129d87db3d140f0a65a0e9d924991c4 /channels | |
| parent | 91ac69db8b0a822538ff806daeb30228e103db74 (diff) | |
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.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128523 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index c6b096c14..0830cfd7f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -213,7 +213,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)) @@ -20376,7 +20375,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); @@ -20398,7 +20398,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_limitonpeers = FALSE; /*!< Match call limit on peers only */ global_notifyhold = FALSE; /*!< Keep track of hold status for a peer */ |