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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@197700 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1ad4e07824594d0254a06833b8a4d913ed1cbcb9..3c0f71e2aff87b418363b4f2bc30eace692fd520 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -11180,7 +11180,6 @@ static void set_config_destroy(void)
        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 @@ static int set_config(char *config_file, int reload)
 
        min_reg_expire = IAX_DEFAULT_REG_EXPIRE;
        max_reg_expire = IAX_DEFAULT_REG_EXPIRE;
+       global_max_trunk_mtu = MAX_TRUNK_MTU;
 
        maxauthreq = 3;