[svn-commits] russell: trunk r46359 - in /trunk: ./ channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: russell
Date: Fri Oct 27 10:44:34 2006
New Revision: 46359

URL: http://svn.digium.com/view/asterisk?rev=46359&view=rev
Log:
Merged revisions 46358 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46358 | russell | 2006-10-27 10:32:40 -0500 (Fri, 27 Oct 2006) | 5 lines

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)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=46359&r1=46358&r2=46359&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Fri Oct 27 10:44:34 2006
@@ -11599,7 +11599,13 @@
 	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
@@ -12285,7 +12291,6 @@
 {
 	struct ast_config *cfg;
 	struct ast_variable *v;
-	struct ast_variable *vjb;
 	int res;
 
 #ifdef HAVE_PRI
@@ -12368,11 +12373,6 @@
 	}
 #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);