/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- This file is part of systemd.
-
- Copyright 2017 Susant Sahani
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
#include <net/if.h>
#include <linux/fib_rules.h>
#include "parse-util.h"
#include "socket-util.h"
#include "string-util.h"
+#include "strv.h"
int routing_policy_rule_new(RoutingPolicyRule **ret) {
RoutingPolicyRule *rule;
- rule = new0(RoutingPolicyRule, 1);
+ rule = new(RoutingPolicyRule, 1);
if (!rule)
return -ENOMEM;
- rule->family = AF_INET;
- rule->table = RT_TABLE_MAIN;
+ *rule = (RoutingPolicyRule) {
+ .family = AF_INET,
+ .table = RT_TABLE_MAIN,
+ };
*ret = rule;
return 0;
network_config_section_free(rule->section);
}
- if (rule->network->manager) {
- set_remove(rule->network->manager->rules, rule);
- set_remove(rule->network->manager->rules_foreign, rule);
- }
+ }
+
+ if (rule->manager) {
+ set_remove(rule->manager->rules, rule);
+ set_remove(rule->manager->rules_foreign, rule);
}
free(rule->iif);
const RoutingPolicyRule *a = _a, *b = _b;
int r;
- if (a->family < b->family)
- return -1;
- if (a->family > b->family)
- return 1;
+ r = CMP(a->family, b->family);
+ if (r != 0)
+ return r;
switch (a->family) {
case AF_INET:
case AF_INET6:
- if (a->from_prefixlen < b->from_prefixlen)
- return -1;
- if (a->from_prefixlen > b->from_prefixlen)
- return 1;
+ r = CMP(a->from_prefixlen, b->from_prefixlen);
+ if (r != 0)
+ return r;
- if (a->to_prefixlen < b->to_prefixlen)
- return -1;
- if (a->to_prefixlen > b->to_prefixlen)
- return 1;
+ r = CMP(a->to_prefixlen, b->to_prefixlen);
+ if (r != 0)
+ return r;
- if (a->tos < b->tos)
- return -1;
- if (a->tos > b->tos)
- return 1;
+ r = CMP(a->tos, b->tos);
+ if (r != 0)
+ return r;
- if (a->fwmask < b->fwmark)
- return -1;
- if (a->fwmask > b->fwmark)
- return 1;
+ r = CMP(a->fwmask, b->fwmask);
+ if (r != 0)
+ return r;
- if (a->table < b->table)
- return -1;
- if (a->table > b->table)
- return 1;
+ r = CMP(a->table, b->table);
+ if (r != 0)
+ return r;
r = strcmp_ptr(a->iif, b->iif);
if (!r)
uint8_t tos,
uint32_t fwmark,
uint32_t table,
- char *iif,
- char *oif,
+ const char *iif,
+ const char *oif,
RoutingPolicyRule **ret) {
RoutingPolicyRule rule, *existing;
.tos = tos,
.fwmark = fwmark,
.table = table,
- .iif = iif,
- .oif = oif
+ .iif = (char*) iif,
+ .oif = (char*) oif
};
if (m->rules) {
return -ENOENT;
}
-static int routing_policy_rule_add_internal(Set **rules,
+static int routing_policy_rule_add_internal(Manager *m,
+ Set **rules,
int family,
const union in_addr_union *from,
uint8_t from_prefixlen,
uint8_t tos,
uint32_t fwmark,
uint32_t table,
- char *iif,
- char *oif,
+ const char *_iif,
+ const char *_oif,
RoutingPolicyRule **ret) {
- _cleanup_routing_policy_rule_free_ RoutingPolicyRule *rule = NULL;
+ _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *rule = NULL;
+ _cleanup_free_ char *iif = NULL, *oif = NULL;
int r;
assert_return(rules, -EINVAL);
+ if (_iif) {
+ iif = strdup(_iif);
+ if (!iif)
+ return -ENOMEM;
+ }
+
+ if (_oif) {
+ oif = strdup(_oif);
+ if (!oif)
+ return -ENOMEM;
+ }
+
r = routing_policy_rule_new(&rule);
if (r < 0)
return r;
+ rule->manager = m;
rule->family = family;
rule->from = *from;
rule->from_prefixlen = from_prefixlen;
rule->tos = tos;
rule->fwmark = fwmark;
rule->table = table;
- rule->iif = iif;
- rule->oif = oif;
+ rule->iif = TAKE_PTR(iif);
+ rule->oif = TAKE_PTR(oif);
r = set_ensure_allocated(rules, &routing_policy_rule_hash_ops);
if (r < 0)
uint8_t tos,
uint32_t fwmark,
uint32_t table,
- char *iif,
- char *oif,
+ const char *iif,
+ const char *oif,
RoutingPolicyRule **ret) {
- return routing_policy_rule_add_internal(&m->rules, family, from, from_prefixlen, to, to_prefixlen, tos, fwmark, table, iif, oif, ret);
+ return routing_policy_rule_add_internal(m, &m->rules, family, from, from_prefixlen, to, to_prefixlen, tos, fwmark, table, iif, oif, ret);
}
int routing_policy_rule_add_foreign(Manager *m,
uint8_t tos,
uint32_t fwmark,
uint32_t table,
- char *iif,
- char *oif,
+ const char *iif,
+ const char *oif,
RoutingPolicyRule **ret) {
- return routing_policy_rule_add_internal(&m->rules_foreign, family, from, from_prefixlen, to, to_prefixlen, tos, fwmark, table, iif, oif, ret);
+ return routing_policy_rule_add_internal(m, &m->rules_foreign, family, from, from_prefixlen, to, to_prefixlen, tos, fwmark, table, iif, oif, ret);
}
static int routing_policy_rule_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
- _cleanup_link_unref_ Link *link = userdata;
+ _cleanup_(link_unrefp) Link *link = userdata;
int r;
assert(m);
assert(link);
assert(link->ifname);
- link->link_messages--;
+ link->routing_policy_rule_remove_messages--;
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return 1;
}
static int routing_policy_rule_new_static(Network *network, const char *filename, unsigned section_line, RoutingPolicyRule **ret) {
- _cleanup_routing_policy_rule_free_ RoutingPolicyRule *rule = NULL;
- _cleanup_network_config_section_free_ NetworkConfigSection *n = NULL;
+ _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *rule = NULL;
+ _cleanup_(network_config_section_freep) NetworkConfigSection *n = NULL;
int r;
assert(network);
rule = hashmap_get(network->rules_by_section, n);
if (rule) {
- *ret = rule;
- rule = NULL;
+ *ret = TAKE_PTR(rule);
return 0;
}
if (r < 0)
return r;
- rule->section = n;
+ rule->section = TAKE_PTR(n);
rule->network = network;
- n = NULL;
r = hashmap_put(network->rules_by_section, rule->section, rule);
if (r < 0)
LIST_APPEND(rules, network->rules, rule);
network->n_rules++;
- *ret = rule;
- rule = NULL;
+ *ret = TAKE_PTR(rule);
return 0;
}
int link_routing_policy_rule_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
- _cleanup_link_unref_ Link *link = userdata;
+ _cleanup_(link_unrefp) Link *link = userdata;
int r;
assert(rtnl);
assert(m);
assert(link);
assert(link->ifname);
- assert(link->link_messages > 0);
+ assert(link->routing_policy_rule_messages > 0);
- link->link_messages--;
+ link->routing_policy_rule_messages--;
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return 1;
if (r < 0 && r != -EEXIST)
log_link_warning_errno(link, r, "Could not add routing policy rule: %m");
- if (link->link_messages == 0)
+ if (link->routing_policy_rule_messages == 0) {
log_link_debug(link, "Routing policy rule configured");
+ link->routing_policy_rules_configured = true;
+ link_check_ready(link);
+ }
return 1;
}
void *data,
void *userdata) {
- _cleanup_routing_policy_rule_free_ RoutingPolicyRule *n = NULL;
+ _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *n = NULL;
Network *network = userdata;
int r;
void *data,
void *userdata) {
- _cleanup_routing_policy_rule_free_ RoutingPolicyRule *n = NULL;
+ _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *n = NULL;
Network *network = userdata;
int r;
void *data,
void *userdata) {
- _cleanup_routing_policy_rule_free_ RoutingPolicyRule *n = NULL;
+ _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *n = NULL;
Network *network = userdata;
int r;
void *data,
void *userdata) {
- _cleanup_routing_policy_rule_free_ RoutingPolicyRule *n = NULL;
+ _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *n = NULL;
Network *network = userdata;
int r;
void *data,
void *userdata) {
- _cleanup_routing_policy_rule_free_ RoutingPolicyRule *n = NULL;
+ _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *n = NULL;
Network *network = userdata;
union in_addr_union buffer;
uint8_t prefixlen;
void *data,
void *userdata) {
- _cleanup_routing_policy_rule_free_ RoutingPolicyRule *n = NULL;
+ _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *n = NULL;
Network *network = userdata;
int r;
if (size <= 0)
return -ENODATA;
- *ret = s;
- s = NULL;
+ *ret = TAKE_PTR(s);
return size;
}
return r;
STRV_FOREACH(i, l) {
- _cleanup_routing_policy_rule_free_ RoutingPolicyRule *rule = NULL;
+ _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *rule = NULL;
p = startswith(*i, "RULE=");
if (!p)
}
} else if (streq(a, "iif")) {
- rule->iif = strdup(b);
- if (!rule->iif)
+ if (free_and_strdup(&rule->iif, b) < 0)
return log_oom();
+
} else if (streq(a, "oif")) {
- rule->oif = strdup(b);
- if (!rule->oif)
+ if (free_and_strdup(&rule->oif, b) < 0)
return log_oom();
}
}
continue;
}
- link->link_messages++;
+ link->routing_policy_rule_remove_messages++;
}
}
}
projects / thirdparty / systemd.git / blobdiff