stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "routing rules: mark support"

Browse source 
This reverts commit ee88c71d16.
This commit is contained in:
Thomas Graf 2010-10-29 11:52:22 +02:00
parent 858527622a
commit 1eccb7b99c
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/netlink-types.h
View file

@ -282,7 +282,7 @@ struct rtnl_rule
{
NLHDR_COMMON
uint32_t r_mark;
uint64_t r_mark;
uint32_t r_prio;
uint32_t r_realms;
uint32_t r_table;

4
include/netlink/route/rule.h
View file

@ -44,8 +44,8 @@ extern void rtnl_rule_set_family(struct rtnl_rule *, int);
extern int rtnl_rule_get_family(struct rtnl_rule *);
extern void rtnl_rule_set_prio(struct rtnl_rule *, int);
extern int rtnl_rule_get_prio(struct rtnl_rule *);
extern void rtnl_rule_set_mark(struct rtnl_rule *, uint32_t);
extern uint32_t rtnl_rule_get_mark(struct rtnl_rule *);
extern void rtnl_rule_set_mark(struct rtnl_rule *, uint64_t);
extern uint64_t rtnl_rule_get_mark(struct rtnl_rule *);
extern void rtnl_rule_set_table(struct rtnl_rule *, int);
extern int rtnl_rule_get_table(struct rtnl_rule *);
extern void rtnl_rule_set_dsfield(struct rtnl_rule *, int);

26
lib/route/rule.c
View file

@ -72,9 +72,9 @@ static int rule_clone(struct nl_object *_dst, struct nl_object *_src)
static struct nla_policy rule_policy[RTA_MAX+1] = {
[RTA_PRIORITY] = { .type = NLA_U32 },
[RTA_FLOW] = { .type = NLA_U32 },
[RTA_PROTOINFO] = { .type = NLA_U32 },
[RTA_IIF] = { .type = NLA_STRING,
.maxlen = IFNAMSIZ, },
[RTA_MARK] = { .type = NLA_U32 },
};
static int rule_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
@ -127,6 +127,11 @@ static int rule_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
rule->ce_mask |= RULE_ATTR_DST;
}
if (tb[RTA_PROTOINFO]) {
rule->r_mark = nla_get_u32(tb[RTA_PROTOINFO]);
rule->ce_mask |= RULE_ATTR_MARK;
}
if (tb[RTA_IIF]) {
nla_strlcpy(rule->r_iif, tb[RTA_IIF], IFNAMSIZ);
rule->ce_mask |= RULE_ATTR_IIF;
@ -149,11 +154,6 @@ static int rule_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
rule->ce_mask |= RULE_ATTR_TABLE;
}
if (tb[RTA_MARK]) {
rule->r_mark = nla_get_u32(tb[RTA_MARK]);
rule->ce_mask |= RULE_ATTR_MARK;
}
err = pp->pp_cb((struct nl_object *) rule, pp);
errout:
rtnl_rule_put(rule);
@ -193,7 +193,7 @@ static void rule_dump_line(struct nl_object *o, struct nl_dump_params *p)
nl_dump(p, "tos %d ", r->r_dsfield);
if (r->ce_mask & RULE_ATTR_MARK)
nl_dump(p, "mark %#x", r->r_mark);
nl_dump(p, "mark %" PRIx64 , r->r_mark);
if (r->ce_mask & RULE_ATTR_IIF)
nl_dump(p, "iif %s ", r->r_iif);
@ -381,6 +381,9 @@ static int build_rule_msg(struct rtnl_rule *tmpl, int cmd, int flags,
if (tmpl->ce_mask & RULE_ATTR_PRIO)
NLA_PUT_U32(msg, RTA_PRIORITY, tmpl->r_prio);
if (tmpl->ce_mask & RULE_ATTR_MARK)
NLA_PUT_U32(msg, RTA_PROTOINFO, tmpl->r_mark);
if (tmpl->ce_mask & RULE_ATTR_REALMS)
NLA_PUT_U32(msg, RTA_FLOW, tmpl->r_realms);
@ -532,15 +535,18 @@ int rtnl_rule_get_prio(struct rtnl_rule *rule)
return -1;
}
void rtnl_rule_set_mark(struct rtnl_rule *rule, uint32_t mark)
void rtnl_rule_set_mark(struct rtnl_rule *rule, uint64_t mark)
{
rule->r_mark = mark;
rule->ce_mask |= RULE_ATTR_MARK;
}
uint32_t rtnl_rule_get_mark(struct rtnl_rule *rule)
uint64_t rtnl_rule_get_mark(struct rtnl_rule *rule)
{
return rule->r_mark;
if (rule->ce_mask & RULE_ATTR_MARK)
return rule->r_mark;
else
return UINT_LEAST64_MAX;
}
void rtnl_rule_set_table(struct rtnl_rule *rule, int table)