[svn-commits] oej: branch 1.4 r44830 - /branches/1.4/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Tue Oct 10 14:23:36 2006
New Revision: 44830

URL: http://svn.digium.com/view/asterisk?rev=44830&view=rev
Log:
Do not set default/global values in the variable declaration, set it in reload_config()

Modified:
    branches/1.4/channels/chan_sip.c

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?rev=44830&r1=44829&r2=44830&view=diff
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Tue Oct 10 14:23:36 2006
@@ -181,10 +181,10 @@
                                                     below EXPIRY_GUARD_LIMIT */
 #define DEFAULT_EXPIRY 900                          /*!< Expire slowly */
 
-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;
+static int min_expiry;                              /*!< Minimum accepted registration time */
+static int max_expiry;                              /*!< Maximum accepted registration time */
+static int default_expiry;
+static int expiry;
 
 #ifndef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -15679,6 +15679,10 @@
 	allow_external_domains = DEFAULT_ALLOW_EXT_DOM;				/* Allow external invites */
 	global_regcontext[0] = '\0';
 	expiry = DEFAULT_EXPIRY;
+	min_expiry = DEFAULT_MIN_EXPIRY;        /*!< Minimum accepted registration time */
+	max_expiry = DEFAULT_MAX_EXPIRY;        /*!< Maximum accepted registration time */
+	default_expiry = DEFAULT_DEFAULT_EXPIRY;
+	expiry = DEFAULT_EXPIRY;
 	global_notifyringing = DEFAULT_NOTIFYRINGING;
 	global_alwaysauthreject = 0;
 	global_allowsubscribe = FALSE;