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

Commit 9a68ac72 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

ipmr/ip6mr: report origin of mfc entry into rtnl msg 



A mfc entry can be static or not (added via the mroute_sk socket). The patch
reports MFC_STATIC flag into rtm_protocol by setting rtm_protocol to
RTPROT_STATIC or RTPROT_MROUTED.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent adfa85e4

include/uapi/linux/rtnetlink.h

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ enum { 
#define RTPROT_XORP	14	/* XORP */

#define RTPROT_NTK	15	/* Netsukuku */

#define RTPROT_DHCP	16      /* DHCP client */

#define RTPROT_MROUTED	17      /* Multicast daemon */



/* rtm_scope

net/ipv4/ipmr.c

+4 −1
Original line number Diff line number Diff line
@@ -2169,7 +2169,10 @@ static int ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb, 
		goto nla_put_failure;

	rtm->rtm_type     = RTN_MULTICAST;

	rtm->rtm_scope    = RT_SCOPE_UNIVERSE;

	rtm->rtm_protocol = RTPROT_UNSPEC;

	if (c->mfc_flags & MFC_STATIC)

		rtm->rtm_protocol = RTPROT_STATIC;

	else

		rtm->rtm_protocol = RTPROT_MROUTED;

	rtm->rtm_flags    = 0;



	if (nla_put_be32(skb, RTA_SRC, c->mfc_origin) ||

net/ipv6/ip6mr.c

+4 −1
Original line number Diff line number Diff line
@@ -2249,7 +2249,10 @@ static int ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb, 
	if (nla_put_u32(skb, RTA_TABLE, mrt->id))

		goto nla_put_failure;

	rtm->rtm_scope    = RT_SCOPE_UNIVERSE;

	rtm->rtm_protocol = RTPROT_UNSPEC;

	if (c->mfc_flags & MFC_STATIC)

		rtm->rtm_protocol = RTPROT_STATIC;

	else

		rtm->rtm_protocol = RTPROT_MROUTED;

	rtm->rtm_flags    = 0;



	if (nla_put(skb, RTA_SRC, 16, &c->mf6c_origin) ||