diff options
author | Olle Johansson <oej@edvina.net> | 2006-03-05 12:57:34 +0000 |
---|---|---|
committer | Olle Johansson <oej@edvina.net> | 2006-03-05 12:57:34 +0000 |
commit | 6730f817fd0fca073238c2ed056e13891a899f45 (patch) | |
tree | 7394de20d5138b2808f4803ac7463177c9677d51 | |
parent | 24c1501690123dd2463eefa9bc9533e17d65e453 (diff) |
Clear almost all of page2 flags at reload (different fix from 1.2 branch)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 848422fd3..c8954f1ce 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12339,6 +12339,7 @@ static int reload_config(enum channelreloadreason reason) int auto_sip_domains = FALSE; struct sockaddr_in old_bindaddr = bindaddr; int registry_count = 0, peer_count = 0, user_count = 0; + int debugflag; cfg = ast_config_load(config); @@ -12349,7 +12350,11 @@ static int reload_config(enum channelreloadreason reason) } /* Clear all flags before setting default values */ + /* Preserve debugging settings for console */ + ast_copy_flags((&debugflag), (&global_flags_page2), SIP_PAGE2_DEBUG_CONSOLE); ast_clear_flag(&global_flags, AST_FLAGS_ALL); + ast_clear_flag(&global_flags_page2, AST_FLAGS_ALL); + ast_copy_flags((&global_flags_page2), (&debugflag), SIP_PAGE2_DEBUG_CONSOLE); /* Reset IP addresses */ memset(&bindaddr, 0, sizeof(bindaddr)); |