Instead of iterating all of the options once to look for jitterbuffer options,

and then again for everything else, move the processing of jitterbuffer
options into the main loop so that there are no erroneous messages about
ignoring unknown options.  (issue #8226)

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 869a33313accd52b160eb8177d4cd44f40072c39..f5508d34f2ada1bffddf71a33170e705bd4fc7ea 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10419,7 +10419,13 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels)
        int y;
        int found_pseudo = 0;
 
+       /* Copy the default jb config over global_jbconf */
+       memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
+
        while(v) {
+               if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
+                       continue;
+
                /* Create the interface list */
                if (!strcasecmp(v->name, "channel")
 #ifdef HAVE_PRI
@@ -11064,7 +11070,6 @@ static int setup_zap(int reload)
 {
        struct ast_config *cfg;
        struct ast_variable *v;
-       struct ast_variable *vjb;
        int res;
 
 #ifdef HAVE_PRI
@@ -11147,11 +11152,6 @@ static int setup_zap(int reload)
        }
 #endif
        v = ast_variable_browse(cfg, "channels");
-       /* Copy the default jb config over global_jbconf */
-       memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
-       /* Traverse all variables to handle jb conf */
-       for (vjb = v; vjb; vjb = vjb->next)
-               ast_jb_read_conf(&global_jbconf, vjb->name, vjb->value);
        res = process_zap(v, reload, 0);
        ast_mutex_unlock(&iflock);
        ast_config_destroy(cfg);