kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 46358 via svnmerge from

Browse Source 
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)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-10-27 15:44:34 +00:00
parent f19300635f
commit de808a721a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
channels/chan_zap.c
View File

@@ -11599,7 +11599,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
@@ -12285,7 +12291,6 @@ static int setup_zap(int reload)
{
struct ast_config *cfg;
struct ast_variable *v;
struct ast_variable *vjb;
int res;
#ifdef HAVE_PRI
@@ -12368,11 +12373,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);