Compare commits

..

No commits in common. "c631c3d6a340c13adf05dc9b06bd7bd566bd6c9e" and "09d0b46ab61bebafe5bdc1be95ee153dfb13d6bc" have entirely different histories.

4 changed files with 5 additions and 18 deletions

View File

@ -99,13 +99,6 @@ static sd_radv *radv_free(sd_radv *ra) {
sd_radv_prefix_unref(p); sd_radv_prefix_unref(p);
} }
while (ra->route_prefixes) {
sd_radv_route_prefix *p = ra->route_prefixes;
LIST_REMOVE(prefix, ra->route_prefixes, p);
sd_radv_route_prefix_unref(p);
}
free(ra->rdnss); free(ra->rdnss);
free(ra->dnssl); free(ra->dnssl);

View File

@ -306,7 +306,7 @@ int network_verify(Network *network) {
LIST_FOREACH_SAFE(prefixes, prefix, prefix_next, network->static_route_prefixes) LIST_FOREACH_SAFE(prefixes, prefix, prefix_next, network->static_route_prefixes)
if (section_is_invalid(prefix->section)) if (section_is_invalid(prefix->section))
route_prefix_free(prefix); prefix_free(prefix);
LIST_FOREACH_SAFE(rules, rule, rule_next, network->rules) LIST_FOREACH_SAFE(rules, rule, rule_next, network->rules)
if (routing_policy_rule_section_verify(rule) < 0) if (routing_policy_rule_section_verify(rule) < 0)
@ -654,9 +654,6 @@ static Network *network_free(Network *network) {
while ((prefix = network->static_prefixes)) while ((prefix = network->static_prefixes))
prefix_free(prefix); prefix_free(prefix);
while ((prefix = network->static_route_prefixes))
route_prefix_free(prefix);
while ((rule = network->rules)) while ((rule = network->rules))
routing_policy_rule_free(rule); routing_policy_rule_free(rule);
@ -667,7 +664,6 @@ static Network *network_free(Network *network) {
hashmap_free(network->neighbors_by_section); hashmap_free(network->neighbors_by_section);
hashmap_free(network->address_labels_by_section); hashmap_free(network->address_labels_by_section);
hashmap_free(network->prefixes_by_section); hashmap_free(network->prefixes_by_section);
hashmap_free(network->route_prefixes_by_section);
hashmap_free(network->rules_by_section); hashmap_free(network->rules_by_section);
ordered_hashmap_free_with_destructor(network->qdiscs_by_section, qdisc_free); ordered_hashmap_free_with_destructor(network->qdiscs_by_section, qdisc_free);

View File

@ -31,7 +31,7 @@ void prefix_free(Prefix *prefix) {
} }
network_config_section_free(prefix->section); network_config_section_free(prefix->section);
sd_radv_prefix_unref(prefix->radv_prefix); prefix->radv_prefix = sd_radv_prefix_unref(prefix->radv_prefix);
free(prefix); free(prefix);
} }
@ -131,7 +131,6 @@ void route_prefix_free(Prefix *prefix) {
} }
network_config_section_free(prefix->section); network_config_section_free(prefix->section);
sd_radv_route_prefix_unref(prefix->radv_route_prefix);
free(prefix); free(prefix);
} }
@ -331,7 +330,7 @@ int config_parse_route_prefix(const char *unit,
void *userdata) { void *userdata) {
Network *network = userdata; Network *network = userdata;
_cleanup_(route_prefix_free_or_set_invalidp) Prefix *p = NULL; _cleanup_(prefix_free_or_set_invalidp) Prefix *p = NULL;
uint8_t prefixlen = 64; uint8_t prefixlen = 64;
union in_addr_union in6addr; union in_addr_union in6addr;
int r; int r;
@ -373,7 +372,7 @@ int config_parse_route_prefix_lifetime(const char *unit,
void *data, void *data,
void *userdata) { void *userdata) {
Network *network = userdata; Network *network = userdata;
_cleanup_(route_prefix_free_or_set_invalidp) Prefix *p = NULL; _cleanup_(prefix_free_or_set_invalidp) Prefix *p = NULL;
usec_t usec; usec_t usec;
int r; int r;
@ -389,8 +388,7 @@ int config_parse_route_prefix_lifetime(const char *unit,
r = parse_sec(rvalue, &usec); r = parse_sec(rvalue, &usec);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, log_syntax(unit, LOG_ERR, filename, line, r, "Roure lifetime is invalid, ignoring assignment: %s", rvalue);
"Route lifetime is invalid, ignoring assignment: %s", rvalue);
return 0; return 0;
} }