[asterisk-commits] branch oej/managerstuff r11881 - in /team/oej/managerstuff: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sun Mar  5 07:12:11 2006
New Revision: 11881

URL: http://svn.digium.com/view/asterisk?rev=11881&view=rev
Log:
Update to trunk

Modified:
    team/oej/managerstuff/   (props changed)
    team/oej/managerstuff/channels/chan_sip.c

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar  5 07:12:11 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-11792
+/branches/1.2:1-7496,7498-11879

Modified: team/oej/managerstuff/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/chan_sip.c?rev=11881&r1=11880&r2=11881&view=diff
==============================================================================
--- team/oej/managerstuff/channels/chan_sip.c (original)
+++ team/oej/managerstuff/channels/chan_sip.c Sun Mar  5 07:12:11 2006
@@ -12406,6 +12406,11 @@
 	global_rtptimeout = 0;
 	global_rtpholdtimeout = 0;
 	global_rtpkeepalive = 0;
+	pedanticsipchecking = 0;
+	global_reg_timeout = DEFAULT_REGISTRATION_TIMEOUT;
+	global_regattempts_max = 0;
+	ast_clear_flag(&global_flags, AST_FLAGS_ALL);
+	ast_clear_flag(&global_flags_page2, AST_FLAGS_ALL);
 	ast_set_flag(&global_flags_page2, SIP_PAGE2_RTUPDATE);
 
 	/* Initialize some reasonable defaults at SIP reload (used both for channel and as default for peers and users */