Merge in trunkrealloc option for chan_iax2. (issue #8267 reported by marcodmb, branch...

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

diff --git a/CHANGES b/CHANGES
index b93968d0864120ddbb892aa8a66e7e5421e6a6a3..f94f797c8131dcf22aed268e8d71137de854ae1a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -60,6 +60,7 @@ Changes since Asterisk 1.4-beta was branched:
      what Asterisk should set as the maximum number of open files when it loads.
   * Added the jittertargetextra configuration option.
   * Added the URI redirect option for the built-in HTTP server
+  * Added the trunkrealloc configuration option to chan_iax2.
 
 SIP changes
 -----------

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index a1cba300adc2a772c0826256aecaea6046694e0b..cd355b8053a81182827536495d2ca480815cfd70 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -165,6 +165,7 @@ static int resyncthreshold=1000;
 static int maxjitterinterps=10;
 static int jittertargetextra = 40; /* number of milliseconds the new jitter buffer adds on to its size */
 static int trunkfreq = 20;
+static int trunkrealloc = 0;
 static int authdebug = 1;
 static int autokill = 0;
 static int iaxcompat = 0;
@@ -3649,7 +3650,7 @@ static int iax2_trunk_queue(struct chan_iax2_pvt *pvt, struct iax_frame *fr)
        if (tpeer) {
                if (tpeer->trunkdatalen + f->datalen + 4 >= tpeer->trunkdataalloc) {
                        /* Need to reallocate space */
-                       if (tpeer->trunkdataalloc < MAX_TRUNKDATA) {
+                       if (tpeer->trunkdataalloc < MAX_TRUNKDATA || trunkrealloc) {
                                if (!(tmp = ast_realloc(tpeer->trunkdata, tpeer->trunkdataalloc + DEFAULT_TRUNKDATA + IAX2_TRUNK_PREFACE))) {
                                        ast_mutex_unlock(&tpeer->lock);
                                        return -1;
@@ -8909,6 +8910,8 @@ static int set_config(char *config_file, int reload)
 
        maxauthreq = 3;
 
+       trunkrealloc = 0;
+
        v = ast_variable_browse(cfg, "general");
 
        /* Seed initial tos value */
@@ -9050,7 +9053,9 @@ static int set_config(char *config_file, int reload)
                                global_max_trunk_mtu = mtuv; 
                        else 
                                ast_log(LOG_NOTICE, "trunkmtu value out of bounds (%d) at line %d\n",
-                                       mtuv, v->lineno); 
+                                       mtuv, v->lineno);
+               } else if (!strcasecmp(v->name, "trunkrealloc")) {
+                       trunkrealloc = ast_true(v->value);
                } else if (!strcasecmp(v->name, "autokill")) {
                        if (sscanf(v->value, "%d", &x) == 1) {
                                if (x >= 0)

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index afe25538c954d91f85999216678039f1c01cc641..000c1751af3caac868884fa50ed0f5e1e55b6daf 100644 (file)
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -172,6 +172,10 @@ forcejitterbuffer=no
 ;
 ; trunkmtu = 0
 ;
+
+; Set the below option to yes to have the trunking size grow beyond the normal limit.
+; trunkrealloc=yes
+
 ; IAX helper threads
 
 ; Establishes the number of iax helper threads to handle I/O.