Skip to content

Commit

Permalink
rtnl/ipv4: use netconf msg to advertise rp_filter status
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Nicolas Dichtel authored and David S. Miller committed Nov 1, 2012
1 parent b77bc20 commit cc535df
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
1 change: 1 addition & 0 deletions include/uapi/linux/netconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ enum {
NETCONFA_UNSPEC,
NETCONFA_IFINDEX,
NETCONFA_FORWARDING,
NETCONFA_RP_FILTER,
__NETCONFA_MAX
};
#define NETCONFA_MAX (__NETCONFA_MAX - 1)
Expand Down
24 changes: 24 additions & 0 deletions net/ipv4/devinet.c
Original file line number Diff line number Diff line change
Expand Up @@ -1451,6 +1451,8 @@ static int inet_netconf_msgsize_devconf(int type)
/* type -1 is used for ALL */
if (type == -1 || type == NETCONFA_FORWARDING)
size += nla_total_size(4);
if (type == -1 || type == NETCONFA_RP_FILTER)
size += nla_total_size(4);

return size;
}
Expand Down Expand Up @@ -1479,6 +1481,10 @@ static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex,
nla_put_s32(skb, NETCONFA_FORWARDING,
IPV4_DEVCONF(*devconf, FORWARDING)) < 0)
goto nla_put_failure;
if ((type == -1 || type == NETCONFA_RP_FILTER) &&
nla_put_s32(skb, NETCONFA_RP_FILTER,
IPV4_DEVCONF(*devconf, RP_FILTER)) < 0)
goto nla_put_failure;

return nlmsg_end(skb, nlh);

Expand Down Expand Up @@ -1515,6 +1521,7 @@ static void inet_netconf_notify_devconf(struct net *net, int type, int ifindex,
static const struct nla_policy devconf_ipv4_policy[NETCONFA_MAX+1] = {
[NETCONFA_IFINDEX] = { .len = sizeof(int) },
[NETCONFA_FORWARDING] = { .len = sizeof(int) },
[NETCONFA_RP_FILTER] = { .len = sizeof(int) },
};

static int inet_netconf_get_devconf(struct sk_buff *in_skb,
Expand Down Expand Up @@ -1647,6 +1654,23 @@ static int devinet_conf_proc(ctl_table *ctl, int write,
i == IPV4_DEVCONF_ROUTE_LOCALNET - 1)
if ((new_value == 0) && (old_value != 0))
rt_cache_flush(net);
if (i == IPV4_DEVCONF_RP_FILTER - 1 &&
new_value != old_value) {
int ifindex;

if (cnf == net->ipv4.devconf_dflt)
ifindex = NETCONFA_IFINDEX_DEFAULT;
else if (cnf == net->ipv4.devconf_all)
ifindex = NETCONFA_IFINDEX_ALL;
else {
struct in_device *idev =
container_of(cnf, struct in_device,
cnf);
ifindex = idev->dev->ifindex;
}
inet_netconf_notify_devconf(net, NETCONFA_RP_FILTER,
ifindex, cnf);
}
}

return ret;
Expand Down

0 comments on commit cc535df

Please sign in to comment.