Commit 5c1d5665 authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

More fixes to error handling in config parser.

parent c8be4307
...@@ -714,31 +714,31 @@ parse_config(gnc_t gnc, void *closure) ...@@ -714,31 +714,31 @@ parse_config(gnc_t gnc, void *closure)
if(strcmp(token, "in") == 0) { if(strcmp(token, "in") == 0) {
struct filter *filter; struct filter *filter;
c = parse_filter(c, gnc, closure, &filter); c = parse_filter(c, gnc, closure, &filter);
if(filter == NULL) if(c < -1)
return -1; return -1;
add_filter(filter, &input_filters); add_filter(filter, &input_filters);
} else if(strcmp(token, "out") == 0) { } else if(strcmp(token, "out") == 0) {
struct filter *filter; struct filter *filter;
c = parse_filter(c, gnc, closure, &filter); c = parse_filter(c, gnc, closure, &filter);
if(filter == NULL) if(c < -1)
return -1; return -1;
add_filter(filter, &output_filters); add_filter(filter, &output_filters);
} else if(strcmp(token, "redistribute") == 0) { } else if(strcmp(token, "redistribute") == 0) {
struct filter *filter; struct filter *filter;
c = parse_filter(c, gnc, closure, &filter); c = parse_filter(c, gnc, closure, &filter);
if(filter == NULL) if(c < -1)
return -1; return -1;
add_filter(filter, &redistribute_filters); add_filter(filter, &redistribute_filters);
} else if(strcmp(token, "interface") == 0) { } else if(strcmp(token, "interface") == 0) {
struct interface_conf *if_conf; struct interface_conf *if_conf;
c = parse_ifconf(c, gnc, closure, &if_conf); c = parse_ifconf(c, gnc, closure, &if_conf);
if(if_conf == NULL) if(c < -1)
return -1; return -1;
add_ifconf(if_conf, &interface_confs); add_ifconf(if_conf, &interface_confs);
} else if(strcmp(token, "default") == 0) { } else if(strcmp(token, "default") == 0) {
struct interface_conf *if_conf; struct interface_conf *if_conf;
c = parse_anonymous_ifconf(c, gnc, closure, NULL, &if_conf); c = parse_anonymous_ifconf(c, gnc, closure, NULL, &if_conf);
if(if_conf == NULL) if(c < -1)
return -1; return -1;
if(default_interface_conf == NULL) if(default_interface_conf == NULL)
default_interface_conf = if_conf; default_interface_conf = if_conf;
...@@ -749,7 +749,7 @@ parse_config(gnc_t gnc, void *closure) ...@@ -749,7 +749,7 @@ parse_config(gnc_t gnc, void *closure)
} }
} else { } else {
c = parse_option(c, gnc, closure, token); c = parse_option(c, gnc, closure, token);
if(c < -2) if(c < -1)
return -1; return -1;
} }
free(token); free(token);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment