Don't allow trunkfreq to be greater than 1000ms.

........

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

Merged revisions 355794 from http://svn.asterisk.org/svn/asterisk/branches/10

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 8bdde9bdf447e2537fe6e46cf4b9f896aa858e05..de9fe8af8b7825682116d170630087c18fc072be 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -13245,8 +13245,13 @@ static int set_config(const char *config_file, int reload)
                        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 )

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 2f5858e95ae6c5e82aa86705f69f86c81b84b99b..a717a8575c472bd848254a4a80bfed9e15464780 100644 (file)
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -189,7 +189,8 @@ forcejitterbuffer=no
 ; 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.