@@ -142,4 +142,11 @@ extern void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr,
extern void ip_mc_inc_group(struct in_device *in_dev, __be32 addr);
int ip_mc_check_igmp(struct sk_buff *skb);
+#define for_each_pmc_rcu(in_dev, pmc) \
+ for (pmc = rcu_dereference(in_dev->mc_list); \
+ pmc != NULL; \
+ pmc = rcu_dereference(pmc->next_rcu))
+
+int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev,
+ const struct ip_mc_list *im, int event, int flags);
#endif
@@ -114,6 +114,7 @@ struct inet_fill_args {
unsigned int flags;
int netnsid;
int ifindex;
+ enum addr_type_t type;
};
#define IN4_ADDR_HSIZE_SHIFT 8
@@ -1850,21 +1851,44 @@ static int in_dev_dump_addr(struct in_device *in_dev, struct sk_buff *skb,
struct netlink_callback *cb, int *s_ip_idx,
struct inet_fill_args *fillargs)
{
+ struct ip_mc_list *im;
struct in_ifaddr *ifa;
int ip_idx = 0;
int err;
- in_dev_for_each_ifa_rcu(ifa, in_dev) {
- if (ip_idx < *s_ip_idx) {
+ switch (fillargs->type) {
+ case UNICAST_ADDR:
+ fillargs->event = RTM_NEWADDR;
+ in_dev_for_each_ifa_rcu(ifa, in_dev) {
+ if (ip_idx < *s_ip_idx) {
+ ip_idx++;
+ continue;
+ }
+ err = inet_fill_ifaddr(skb, ifa, fillargs);
+ if (err < 0)
+ goto done;
+
+ nl_dump_check_consistent(cb, nlmsg_hdr(skb));
ip_idx++;
- continue;
}
- err = inet_fill_ifaddr(skb, ifa, fillargs);
- if (err < 0)
- goto done;
+ break;
+ case MULTICAST_ADDR:
+ for_each_pmc_rcu(in_dev, im) {
+ if (ip_idx < *s_ip_idx) {
+ ip_idx++;
+ continue;
+ }
+ err = inet_fill_ifmcaddr(skb, in_dev->dev, im,
+ RTM_GETMULTICAST, NLM_F_MULTI);
+ if (err < 0)
+ goto done;
- nl_dump_check_consistent(cb, nlmsg_hdr(skb));
- ip_idx++;
+ nl_dump_check_consistent(cb, nlmsg_hdr(skb));
+ ip_idx++;
+ }
+ break;
+ default:
+ break;
}
err = 0;
ip_idx = 0;
@@ -1889,15 +1913,16 @@ static u32 inet_base_seq(const struct net *net)
return res;
}
-static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
+static int inet_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
+ enum addr_type_t type)
{
const struct nlmsghdr *nlh = cb->nlh;
struct inet_fill_args fillargs = {
.portid = NETLINK_CB(cb->skb).portid,
.seq = nlh->nlmsg_seq,
- .event = RTM_NEWADDR,
.flags = NLM_F_MULTI,
.netnsid = -1,
+ .type = type,
};
struct net *net = sock_net(skb->sk);
struct net *tgt_net = net;
@@ -1949,6 +1974,20 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
return err;
}
+static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
+{
+ enum addr_type_t type = UNICAST_ADDR;
+
+ return inet_dump_addr(skb, cb, type);
+}
+
+static int inet_dump_ifmcaddr(struct sk_buff *skb, struct netlink_callback *cb)
+{
+ enum addr_type_t type = MULTICAST_ADDR;
+
+ return inet_dump_addr(skb, cb, type);
+}
+
static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh,
u32 portid)
{
@@ -2845,6 +2884,8 @@ static const struct rtnl_msg_handler devinet_rtnl_msg_handlers[] __initconst = {
{.protocol = PF_INET, .msgtype = RTM_GETNETCONF,
.doit = inet_netconf_get_devconf, .dumpit = inet_netconf_dump_devconf,
.flags = RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED},
+ {.owner = THIS_MODULE, .protocol = PF_INET, .msgtype = RTM_GETMULTICAST,
+ .dumpit = inet_dump_ifmcaddr, .flags = RTNL_FLAG_DUMP_UNLOCKED},
};
void __init devinet_init(void)
@@ -174,11 +174,6 @@ static void ip_ma_put(struct ip_mc_list *im)
}
}
-#define for_each_pmc_rcu(in_dev, pmc) \
- for (pmc = rcu_dereference(in_dev->mc_list); \
- pmc != NULL; \
- pmc = rcu_dereference(pmc->next_rcu))
-
#define for_each_pmc_rtnl(in_dev, pmc) \
for (pmc = rtnl_dereference(in_dev->mc_list); \
pmc != NULL; \
@@ -1432,14 +1427,14 @@ static void ip_mc_hash_remove(struct in_device *in_dev,
*mc_hash = im->next_hash;
}
-static int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev,
- const struct ip_mc_list *im, int event)
+int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev,
+ const struct ip_mc_list *im, int event, int flags)
{
struct ifa_cacheinfo ci;
struct ifaddrmsg *ifm;
struct nlmsghdr *nlh;
- nlh = nlmsg_put(skb, 0, 0, event, sizeof(struct ifaddrmsg), 0);
+ nlh = nlmsg_put(skb, 0, 0, event, sizeof(struct ifaddrmsg), flags);
if (!nlh)
return -EMSGSIZE;
@@ -1464,6 +1459,7 @@ static int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev,
nlmsg_end(skb, nlh);
return 0;
}
+EXPORT_SYMBOL(inet_fill_ifmcaddr);
static void inet_ifmcaddr_notify(struct net_device *dev,
const struct ip_mc_list *im, int event)
@@ -1477,7 +1473,7 @@ static void inet_ifmcaddr_notify(struct net_device *dev,
if (!skb)
goto error;
- err = inet_fill_ifmcaddr(skb, dev, im, event);
+ err = inet_fill_ifmcaddr(skb, dev, im, event, 0);
if (err < 0) {
WARN_ON_ONCE(err == -EMSGSIZE);
nlmsg_free(skb);
Extended RTM_GETMULTICAST to support dumping joined IPv4 multicast addresses, in addition to the existing IPv6 functionality. This allows userspace applications to retrieve both IPv4 and IPv6 multicast addresses through similar netlink command and then monitor future changes by registering to RTNLGRP_IPV4_MCADDR and RTNLGRP_IPV6_MCADDR. Cc: Maciej Żenczykowski <maze@google.com> Cc: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: Yuyang Huang <yuyanghuang@google.com> --- Changelog since v1: - Minor style fixes. - Use for_each_pmc_rcu() instead of for_each_pmc_rtnl(). include/linux/igmp.h | 7 +++++ net/ipv4/devinet.c | 61 ++++++++++++++++++++++++++++++++++++-------- net/ipv4/igmp.c | 14 ++++------ 3 files changed, 63 insertions(+), 19 deletions(-)