[svn-commits] seanbright: branch 10 r355794 - in /branches/10: ./ channels/ configs/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Fri Feb 17 16:03:04 2012
New Revision: 355794

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=355794
Log:
Don't allow trunkfreq to be greater than 1000ms.
........

Merged revisions 355793 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_iax2.c
    branches/10/configs/iax.conf.sample

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_iax2.c?view=diff&rev=355794&r1=355793&r2=355794
==============================================================================
--- branches/10/channels/chan_iax2.c (original)
+++ branches/10/channels/chan_iax2.c Fri Feb 17 16:03:04 2012
@@ -13349,8 +13349,13 @@
 			ast_set2_flag64((&globalflags), i || ast_true(v->value), IAX_RTAUTOCLEAR);
 		} else if (!strcasecmp(v->name, "trunkfreq")) {
 			trunkfreq = atoi(v->value);
-			if (trunkfreq < 10)
+			if (trunkfreq < 10) {
+				ast_log(LOG_NOTICE, "trunkfreq must be between 10ms and 1000ms, using 10ms instead.\n");
 				trunkfreq = 10;
+			} else if (trunkfreq > 1000) {
+				ast_log(LOG_NOTICE, "trunkfreq must be between 10ms and 1000ms, using 1000ms instead.\n");
+				trunkfreq = 1000;
+			}
 		} else if (!strcasecmp(v->name, "trunkmtu")) {
 			mtuv = atoi(v->value);
 			if (mtuv  == 0 )

Modified: branches/10/configs/iax.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/10/configs/iax.conf.sample?view=diff&rev=355794&r1=355793&r2=355794
==============================================================================
--- branches/10/configs/iax.conf.sample (original)
+++ branches/10/configs/iax.conf.sample Fri Feb 17 16:03:04 2012
@@ -189,7 +189,8 @@
 ; increasing the time between sending trunk messages, the trunk's payload size will increase as
 ; well.  Note, depending on the size set by trunkmtu, messages may be sent more often than
 ; specified.  For example if a trunk's message size grows to the trunkmtu size before 20ms is
-; reached that message will be sent immediately.
+; reached that message will be sent immediately.  Acceptable values are between 10ms and
+; 1000ms.
 ;
 ; trunkfreq=20     ; How frequently to send trunk msgs (in ms). This is 20ms by default.