Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73483c12 authored by Guillaume Nault's avatar Guillaume Nault Committed by David S. Miller
Browse files

ipv6: report NLM_F_CREATE and NLM_F_EXCL flags in RTM_NEWROUTE events 



Since commit 37a1d361 ("ipv6: include NLM_F_REPLACE in route
replace notifications"), RTM_NEWROUTE notifications have their
NLM_F_REPLACE flag set if the new route replaced a preexisting one.
However, other flags aren't set.

This patch reports the missing NLM_F_CREATE and NLM_F_EXCL flag bits.

NLM_F_APPEND is not reported, because in ipv6 a NLM_F_CREATE request
is interpreted as an append request (contrary to ipv4, "prepend" is not
supported, so if NLM_F_EXCL is not set then NLM_F_APPEND is implicit).

As a result, the possible flag combination can now be reported
(iproute2's terminology into parentheses):

  * NLM_F_CREATE | NLM_F_EXCL: route didn't exist, exclusive creation
    ("add").
  * NLM_F_CREATE: route did already exist, new route added after
    preexisting ones ("append").
  * NLM_F_REPLACE: route did already exist, new route replaced the
    first preexisting one ("change").

Signed-off-by: default avatarGuillaume Nault <g.nault@alphalink.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b93e1fa7

net/ipv6/ip6_fib.c

+5 −1
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, 
		   (info->nlh->nlmsg_flags & NLM_F_CREATE));

	int found = 0;

	bool rt_can_ecmp = rt6_qualify_for_ecmp(rt);

	u16 nlflags = NLM_F_EXCL;

	int err;



	ins = &fn->leaf;
@@ -759,6 +760,8 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, 
			if (info->nlh &&

			    (info->nlh->nlmsg_flags & NLM_F_EXCL))

				return -EEXIST;



			nlflags &= ~NLM_F_EXCL;

			if (replace) {

				if (rt_can_ecmp == rt6_qualify_for_ecmp(iter)) {

					found++;
@@ -856,6 +859,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, 
			pr_warn("NLM_F_CREATE should be set when creating new route\n");



add:

		nlflags |= NLM_F_CREATE;

		err = fib6_commit_metrics(&rt->dst, mxc);

		if (err)

			return err;
@@ -864,7 +868,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, 
		*ins = rt;

		rt->rt6i_node = fn;

		atomic_inc(&rt->rt6i_ref);

		inet6_rt_notify(RTM_NEWROUTE, rt, info, 0);

		inet6_rt_notify(RTM_NEWROUTE, rt, info, nlflags);

		info->nl_net->ipv6.rt6_stats->fib_rt_entries++;



		if (!(fn->fn_flags & RTN_RTINFO)) {