From: Olle Johansson <oej@edvina.net>
Date: Mon, 7 Sep 2009 16:41:04 +0000 (+0000)
Subject: Merged revisions 216842 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c94611d613440809acb6882aa3b8bdcbaab8d28;p=thirdparty%2Fasterisk.git

Merged revisions 216842 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r216842 | oej | 2009-09-07 18:35:12 +0200 (MÃ¥n, 07 Sep 2009) | 2 lines

Make sure we reset global_exclude_static at channel reload

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4ddcce902b..25bbf66550 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -813,11 +813,11 @@ static enum st_refresher global_st_refresher; /*!< Session-Timer refresher
 static int global_min_se;                     /*!< Lowest threshold for session refresh interval  */
 static int global_max_se;                     /*!< Highest threshold for session refresh interval */
 
-/*@}*/ 
+static int global_dynamic_exclude_static = 0;	/*!< Exclude static peers from contact registrations */
+/*@}*/
 
 /*! \brief Global list of addresses dynamic peers are not allowed to use */
 static struct ast_ha *global_contact_ha = NULL;
-static int global_dynamic_exclude_static = 0;
 
 /*! \name Object counters @{
  * \bug These counters are not handled in a thread-safe way ast_atomic_fetchadd_int()
@@ -22743,6 +22743,7 @@ static int reload_config(enum channelreloadreason reason)
 	ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWSUBSCRIBE);	/* Default for all devices: TRUE */
 	ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWOVERLAP);		/* Default for all devices: TRUE */
 	sip_cfg.peer_rtupdate = TRUE;
+	global_dynamic_exclude_static = 0;	/* Exclude static peers */
 
 	/* Session-Timers */
 	global_st_mode = SESSION_TIMER_MODE_ACCEPT;