Commit b8964ed9 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[NET] rules: Protocol independant mark selector 



Move mark selector currently implemented per protocol into
the protocol independant part.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f300893

include/linux/fib_rules.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ enum 
	FRA_UNUSED3,

	FRA_UNUSED4,

	FRA_UNUSED5,

	FRA_FWMARK,	/* netfilter mark */

	FRA_FWMARK,	/* mark */

	FRA_FLOW,	/* flow/class id */

	FRA_UNUSED6,

	FRA_UNUSED7,

include/net/fib_rules.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ struct fib_rule 
	atomic_t		refcnt;

	int			ifindex;

	char			ifname[IFNAMSIZ];

	u32			mark;

	u32			mark_mask;

	u32			pref;

	u32			flags;

	u32			table;

net/core/fib_rules.c

+29 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ int fib_rules_lookup(struct fib_rules_ops *ops, struct flowi *fl, 
		if (rule->ifindex && (rule->ifindex != fl->iif))

			continue;



		if ((rule->mark ^ fl->mark) & rule->mark_mask)

			continue;



		if (!ops->match(rule, fl, flags))

			continue;
@@ -179,6 +182,18 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
			rule->ifindex = dev->ifindex;

	}



	if (tb[FRA_FWMARK]) {

		rule->mark = nla_get_u32(tb[FRA_FWMARK]);

		if (rule->mark)

			/* compatibility: if the mark value is non-zero all bits

			 * are compared unless a mask is explicitly specified.

			 */

			rule->mark_mask = 0xFFFFFFFF;

	}



	if (tb[FRA_FWMASK])

		rule->mark_mask = nla_get_u32(tb[FRA_FWMASK]);



	rule->action = frh->action;

	rule->flags = frh->flags;

	rule->table = frh_get_table(frh, tb);
@@ -250,6 +265,14 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
		    nla_strcmp(tb[FRA_IFNAME], rule->ifname))

			continue;



		if (tb[FRA_FWMARK] &&

		    (rule->mark != nla_get_u32(tb[FRA_FWMARK])))

			continue;



		if (tb[FRA_FWMASK] &&

		    (rule->mark_mask != nla_get_u32(tb[FRA_FWMASK])))

			continue;



		if (!ops->compare(rule, frh, tb))

			continue;
@@ -298,6 +321,12 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule, 
	if (rule->pref)

		NLA_PUT_U32(skb, FRA_PRIORITY, rule->pref);



	if (rule->mark)

		NLA_PUT_U32(skb, FRA_FWMARK, rule->mark);



	if (rule->mark_mask || rule->mark)

		NLA_PUT_U32(skb, FRA_FWMASK, rule->mark_mask);



	if (ops->fill(rule, skb, nlh, frh) < 0)

		goto nla_put_failure;

net/decnet/dn_rules.c

+0 −27
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ struct dn_fib_rule 
	__le16			dstmask;

	__le16			srcmap;

	u8			flags;

	u32			fwmark;

	u32			fwmask;

};



static struct dn_fib_rule default_rule = {
@@ -129,9 +127,6 @@ static int dn_fib_rule_match(struct fib_rule *rule, struct flowi *fl, int flags) 
	    ((daddr ^ r->dst) & r->dstmask))

		return 0;



	if ((r->fwmark ^ fl->mark) & r->fwmask)

		return 0;



	return 1;

}
@@ -165,18 +160,6 @@ static int dn_fib_rule_configure(struct fib_rule *rule, struct sk_buff *skb, 
	if (tb[FRA_DST])

		r->dst = nla_get_u16(tb[FRA_DST]);



	if (tb[FRA_FWMARK]) {

		r->fwmark = nla_get_u32(tb[FRA_FWMARK]);

		if (r->fwmark)

			/* compatibility: if the mark value is non-zero all bits

			 * are compared unless a mask is explicitly specified.

			 */

			r->fwmask = 0xFFFFFFFF;

	}



	if (tb[FRA_FWMASK])

		r->fwmask = nla_get_u32(tb[FRA_FWMASK]);



	r->src_len = frh->src_len;

	r->srcmask = dnet_make_mask(r->src_len);

	r->dst_len = frh->dst_len;
@@ -197,12 +180,6 @@ static int dn_fib_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh, 
	if (frh->dst_len && (r->dst_len != frh->dst_len))

		return 0;



	if (tb[FRA_FWMARK] && (r->fwmark != nla_get_u32(tb[FRA_FWMARK])))

		return 0;



	if (tb[FRA_FWMASK] && (r->fwmask != nla_get_u32(tb[FRA_FWMASK])))

		return 0;



	if (tb[FRA_SRC] && (r->src != nla_get_u16(tb[FRA_SRC])))

		return 0;
@@ -240,10 +217,6 @@ static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb, 
	frh->src_len = r->src_len;

	frh->tos = 0;



	if (r->fwmark)

		NLA_PUT_U32(skb, FRA_FWMARK, r->fwmark);

	if (r->fwmask || r->fwmark)

		NLA_PUT_U32(skb, FRA_FWMASK, r->fwmask);

	if (r->dst_len)

		NLA_PUT_U16(skb, FRA_DST, r->dst);

	if (r->src_len)

net/ipv4/fib_rules.c

+0 −29
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ struct fib4_rule 
	__be32			srcmask;

	__be32			dst;

	__be32			dstmask;

	u32			fwmark;

	u32			fwmask;

#ifdef CONFIG_NET_CLS_ROUTE

	u32			tclassid;

#endif
@@ -158,9 +156,6 @@ static int fib4_rule_match(struct fib_rule *rule, struct flowi *fl, int flags) 
	if (r->tos && (r->tos != fl->fl4_tos))

		return 0;



	if ((r->fwmark ^ fl->mark) & r->fwmask)

		return 0;



	return 1;

}
@@ -216,18 +211,6 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb, 
	if (tb[FRA_DST])

		rule4->dst = nla_get_be32(tb[FRA_DST]);



	if (tb[FRA_FWMARK]) {

		rule4->fwmark = nla_get_u32(tb[FRA_FWMARK]);

		if (rule4->fwmark)

			/* compatibility: if the mark value is non-zero all bits

			 * are compared unless a mask is explicitly specified.

			 */

			rule4->fwmask = 0xFFFFFFFF;

	}



	if (tb[FRA_FWMASK])

		rule4->fwmask = nla_get_u32(tb[FRA_FWMASK]);



#ifdef CONFIG_NET_CLS_ROUTE

	if (tb[FRA_FLOW])

		rule4->tclassid = nla_get_u32(tb[FRA_FLOW]);
@@ -258,12 +241,6 @@ static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh, 
	if (frh->tos && (rule4->tos != frh->tos))

		return 0;



	if (tb[FRA_FWMARK] && (rule4->fwmark != nla_get_u32(tb[FRA_FWMARK])))

		return 0;



	if (tb[FRA_FWMASK] && (rule4->fwmask != nla_get_u32(tb[FRA_FWMASK])))

		return 0;



#ifdef CONFIG_NET_CLS_ROUTE

	if (tb[FRA_FLOW] && (rule4->tclassid != nla_get_u32(tb[FRA_FLOW])))

		return 0;
@@ -288,12 +265,6 @@ static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb, 
	frh->src_len = rule4->src_len;

	frh->tos = rule4->tos;



	if (rule4->fwmark)

		NLA_PUT_U32(skb, FRA_FWMARK, rule4->fwmark);



	if (rule4->fwmask || rule4->fwmark)

		NLA_PUT_U32(skb, FRA_FWMASK, rule4->fwmask);



	if (rule4->dst_len)

		NLA_PUT_BE32(skb, FRA_DST, rule4->dst);