j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Never remove items from cmdline_conf.

Browse source 
We should treat cmdline_conf as const, so we can call read_config_options()
more than once with prefix = NULL.
This commit is contained in:
Guus Sliepen 2012-07-20 17:29:16 +02:00
parent 68a20876d0
commit 4591e96c76
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/conf.c
View file

@ -339,33 +339,31 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
} }
void read_config_options(splay_tree_t *config_tree, const char *prefix) { void read_config_options(splay_tree_t *config_tree, const char *prefix) {
list_node_t *node, *next;
size_t prefix_len = prefix ? strlen(prefix) : 0; size_t prefix_len = prefix ? strlen(prefix) : 0;
for(node = cmdline_conf->tail; node; node = next) { for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) {
config_t *orig_cfg, *cfg = (config_t *)node->data; const config_t *cfg = node->data;
next = node->prev; config_t *new;
if(!prefix) { if(!prefix) {
if(strchr(cfg->variable, '.')) if(strchr(cfg->variable, '.'))
continue; continue;
node->data = NULL;
list_unlink_node(cmdline_conf, node);
} else { } else {
if(strncmp(prefix, cfg->variable, prefix_len) || if(strncmp(prefix, cfg->variable, prefix_len) ||
cfg->variable[prefix_len] != '.') cfg->variable[prefix_len] != '.')
continue; continue;
/* Because host configuration is parsed again when
reconnecting, nodes must not be freed when a prefix
is given. */
orig_cfg = cfg;
cfg = new_config();
cfg->variable = xstrdup(orig_cfg->variable + prefix_len + 1);
cfg->value = xstrdup(orig_cfg->value);
cfg->file = NULL;
cfg->line = orig_cfg->line;
} }
config_add(config_tree, cfg);
new = new_config();
if(prefix)
new->variable = xstrdup(cfg->variable + prefix_len + 1);
else
new->variable = xstrdup(cfg->variable);
new->value = xstrdup(cfg->value);
new->file = NULL;
new->line = cfg->line;
config_add(config_tree, new);
} }
} }