[svn-commits] twilson: branch twilson/calendaring r197717 - in /team/twilson/calendaring: ....

[SVN commits to the Digium repositories]

Author: twilson
Date: Thu May 28 14:20:23 2009
New Revision: 197717

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

........
  r197697 | file | 2009-05-28 13:45:11 -0500 (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.
........
  r197701 | mmichelson | 2009-05-28 13:48:56 -0500 (Thu, 28 May 2009) | 3 lines
  
  Add missing lock to local_indicate function for connected line frames.
........

Modified:
    team/twilson/calendaring/   (props changed)
    team/twilson/calendaring/channels/chan_iax2.c
    team/twilson/calendaring/channels/chan_local.c

Propchange: team/twilson/calendaring/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 28 14:20:23 2009
@@ -1,1 +1,1 @@
-/trunk:1-197682
+/trunk:1-197712

Modified: team/twilson/calendaring/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/twilson/calendaring/channels/chan_iax2.c?view=diff&rev=197717&r1=197716&r2=197717
==============================================================================
--- team/twilson/calendaring/channels/chan_iax2.c (original)
+++ team/twilson/calendaring/channels/chan_iax2.c Thu May 28 14:20:23 2009
@@ -11413,7 +11413,6 @@
 	strcpy(language, "");
 	strcpy(mohinterpret, "default");
 	strcpy(mohsuggest, "");
-	global_max_trunk_mtu = MAX_TRUNK_MTU;
 	trunkmaxsize = MAX_TRUNKDATA;
 	amaflags = 0;
 	delayreject = 0;
@@ -11490,6 +11489,7 @@
 
 	min_reg_expire = IAX_DEFAULT_REG_EXPIRE;
 	max_reg_expire = IAX_DEFAULT_REG_EXPIRE;
+	global_max_trunk_mtu = MAX_TRUNK_MTU;
 
 	maxauthreq = 3;
 

Modified: team/twilson/calendaring/channels/chan_local.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/twilson/calendaring/channels/chan_local.c?view=diff&rev=197717&r1=197716&r2=197717
==============================================================================
--- team/twilson/calendaring/channels/chan_local.c (original)
+++ team/twilson/calendaring/channels/chan_local.c Thu May 28 14:20:23 2009
@@ -416,6 +416,7 @@
 		 * we need to transmit the collected connected line information instead of whatever
 		 * happens to be in this control frame. The same applies for redirecting information, which
 		 * is why it is handled here as well.*/
+		ast_mutex_lock(&p->lock);
 		isoutbound = IS_OUTBOUND(ast, p);
 		if (isoutbound) {
 			this_channel = p->chan;