dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 46370 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46370 | russell | 2006-10-27 14:03:32 -0500 (Fri, 27 Oct 2006) | 4 lines

move the copy of the default settings to the global settings back out of
process_zap, so that they aren't overwritten when process_zap is called
multiple times

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46371 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2006-10-27 19:04:34 +00:00
parent 918ad53191
commit d20666b485
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_zap.c
View File

@ -11644,9 +11644,6 @@ 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;
@ -12417,6 +12414,10 @@ static int setup_zap(int reload)
}
}
#endif
/* Copy the default jb config over global_jbconf */
memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
v = ast_variable_browse(cfg, "channels");
res = process_zap(v, reload, 0);
ast_mutex_unlock(&iflock);