[svn-commits] file: branch 1.6.1 r197700 - in /branches/1.6.1: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu May 28 13:47:56 2009
New Revision: 197700

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197700
Log:
Merged revisions 197697 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r197697 | file | 2009-05-28 15:45:11 -0300 (Thu, 28 May 2009) | 2 lines
  
  Fix a bug where the trunkmtu setting was not set to the default value of 1240 on load but was on reload.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=197700&r1=197699&r2=197700
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Thu May 28 13:47:56 2009
@@ -11180,7 +11180,6 @@
 	strcpy(language, "");
 	strcpy(mohinterpret, "default");
 	strcpy(mohsuggest, "");
-	global_max_trunk_mtu = MAX_TRUNK_MTU;
 	trunkmaxsize = MAX_TRUNKDATA;
 	amaflags = 0;
 	delayreject = 0;
@@ -11250,6 +11249,7 @@
 
 	min_reg_expire = IAX_DEFAULT_REG_EXPIRE;
 	max_reg_expire = IAX_DEFAULT_REG_EXPIRE;
+	global_max_trunk_mtu = MAX_TRUNK_MTU;
 
 	maxauthreq = 3;