[asterisk-commits] trunk r11850 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sun Mar  5 06:57:34 2006
New Revision: 11850

URL: http://svn.digium.com/view/asterisk?rev=11850&view=rev
Log:
Clear almost all of page2 flags at reload (different fix from 1.2 branch)

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=11850&r1=11849&r2=11850&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sun Mar  5 06:57:34 2006
@@ -12339,6 +12339,7 @@
 	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 @@
 	}
 	
 	/* 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));