kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

move the copy of the default settings to the global settings back out of

Browse Source 
process_zap, so that they aren't overwritten when process_zap is called
multiple times


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-10-27 19:03:32 +00:00
parent 5a2abaee46
commit 0ed3384fb1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_zap.c
View File

@@ -10419,9 +10419,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;
@@ -11151,6 +11148,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);