/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
- Copyright © 2017 Susant Sahani
-***/
#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;
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) {
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_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->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, &m->rules, family, from, from_prefixlen, to, to_prefixlen, tos, fwmark, table, iif, oif, ret);
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, &m->rules_foreign, family, from, from_prefixlen, to, to_prefixlen, tos, fwmark, table, iif, oif, ret);
}
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)