From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: [PATCH net-next 4/7] ipmr/ip6mr: report origin of mfc entry into rtnl msg
Date: Tue, 4 Dec 2012 12:13:38 +0100 [thread overview]
Message-ID: <1354619621-16016-5-git-send-email-nicolas.dichtel@6wind.com> (raw)
In-Reply-To: <1354619621-16016-1-git-send-email-nicolas.dichtel@6wind.com>
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: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
include/uapi/linux/rtnetlink.h | 1 +
net/ipv4/ipmr.c | 5 ++++-
net/ipv6/ip6mr.c | 5 ++++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 80abe27..33d29ce 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -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
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index c5617d6..91782a7 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -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) ||
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index b744b98..e9ef38f 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -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) ||
--
1.8.0.1
next prev parent reply other threads:[~2012-12-04 11:13 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-04 11:13 [PATCH net-next 0/7] Allow to monitor multicast cache event via rtnetlink Nicolas Dichtel
2012-12-04 11:13 ` [PATCH net-next 1/7] netconf: advertise mc_forwarding status Nicolas Dichtel
2012-12-04 11:13 ` [PATCH net-next 2/7] ip6mr: use nla_nest_* helpers Nicolas Dichtel
2012-12-04 11:13 ` [PATCH net-next 3/7] ipmr/ip6mr: advertise mfc stats via rtnetlink Nicolas Dichtel
2012-12-04 11:13 ` Nicolas Dichtel [this message]
2012-12-04 11:13 ` [PATCH net-next 5/7] ipmr/ip6mr: allow to get unresolved cache via netlink Nicolas Dichtel
2012-12-04 11:13 ` [PATCH net-next 6/7] ipmr: advertise new mfc entries via rtnl Nicolas Dichtel
2012-12-04 11:13 ` [PATCH net-next 7/7] ip6mr: " Nicolas Dichtel
2012-12-04 18:09 ` [PATCH net-next 0/7] Allow to monitor multicast cache event via rtnetlink David Miller
2012-12-04 20:02 ` Nicolas Dichtel
2012-12-05 11:02 ` Nicolas Dichtel
2012-12-05 11:41 ` David Laight
2012-12-05 17:54 ` David Miller
2012-12-06 8:43 ` Nicolas Dichtel
2012-12-06 17:49 ` Thomas Graf
2012-12-06 21:49 ` Nicolas Dichtel
2012-12-07 10:38 ` David Laight
2012-12-07 10:58 ` Thomas Graf
2012-12-11 15:03 ` Nicolas Dichtel
2012-12-11 18:40 ` Thomas Graf
2012-12-12 17:30 ` Nicolas Dichtel
2012-12-14 13:16 ` [PATCH] netlink: align attributes on 64-bits Nicolas Dichtel
2012-12-14 15:49 ` Ben Hutchings
2012-12-14 16:04 ` Nicolas Dichtel
2012-12-17 16:49 ` [PATCH v2] " Nicolas Dichtel
2012-12-17 17:06 ` David Laight
2012-12-17 17:35 ` Nicolas Dichtel
2012-12-18 9:19 ` David Laight
2012-12-18 10:18 ` Nicolas Dichtel
2012-12-18 12:57 ` Thomas Graf
2012-12-18 16:23 ` Nicolas Dichtel
2012-12-18 16:50 ` David Laight
2012-12-18 17:11 ` Thomas Graf
2012-12-19 9:17 ` David Laight
2012-12-19 17:20 ` Thomas Graf
2012-12-20 9:37 ` David Laight
2012-12-20 9:40 ` David Laight
2012-12-18 17:08 ` Thomas Graf
2012-12-18 22:07 ` Nicolas Dichtel
2012-12-19 11:22 ` Nicolas Dichtel
2012-12-19 17:09 ` Thomas Graf
2012-12-19 18:07 ` Nicolas Dichtel
2012-12-17 9:59 ` [PATCH] " David Laight
2012-12-17 16:53 ` Nicolas Dichtel
2012-12-05 17:53 ` [PATCH net-next 0/7] Allow to monitor multicast cache event via rtnetlink David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354619621-16016-5-git-send-email-nicolas.dichtel@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).