netconf: rename PROXY_ARP to NEIGH_PROXY
Subsystems (3)
PATCH 1/3 netconf: rename PROXY_ARP to NEIGH_PROXY
Use same field for both IPv4 (proxy_arp) and IPv6 (proxy_ndp) so fix it before API is set to be a common name
--- include/uapi/linux/netconf.h | 2 +- net/ipv4/devinet.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
include/uapi/linux/netconf.h +1 -1
@@ -14,7 +14,7 @@ enum {NETCONFA_FORWARDING ,NETCONFA_RP_FILTER ,NETCONFA_MC_FORWARDING , -NETCONFA_PROXY_ARP , +NETCONFA_PROXY_NEIGH , __NETCONFA_MAX };#define NETCONFA_MAX (__NETCONFA_MAX - 1)
net/ipv4/devinet.c +5 -5
@@ -1696,7 +1696,7 @@ static int inet_netconf_msgsize_devconf( size +=nla_total_size (4 );if (type ==-1 || type ==NETCONFA_MC_FORWARDING ) size +=nla_total_size (4 ); -if (type ==-1 || type ==NETCONFA_PROXY_ARP ) +if (type ==-1 || type ==NETCONFA_PROXY_NEIGH ) size +=nla_total_size (4 );return size;
@@ -1734,8 +1734,8 @@ static int inet_netconf_fill_devconf(str nla_put_s32(skb, NETCONFA_MC_FORWARDING, IPV4_DEVCONF(*devconf, MC_FORWARDING)) < 0) goto nla_put_failure; -if ((type ==-1 || type ==NETCONFA_PROXY_ARP ) && -nla_put_s32 (skb,NETCONFA_PROXY_ARP , +if ((type ==-1 || type ==NETCONFA_PROXY_NEIGH ) && +nla_put_s32 (skb,NETCONFA_PROXY_NEIGH ,IPV4_DEVCONF (*devconf,PROXY_ARP )) <0 ) goto nla_put_failure;
@@ -1775,7 +1775,7 @@ static const struct nla_policy devconf_i [NETCONFA_IFINDEX] = { .len = sizeof(int) }, [NETCONFA_FORWARDING] = { .len = sizeof(int) }, [NETCONFA_RP_FILTER] = { .len = sizeof(int) }, - [NETCONFA_PROXY_ARP] = { .len = sizeof(int) }, + [NETCONFA_PROXY_NEIGH] = { .len = sizeof(int) }, }; static int inet_netconf_get_devconf(struct sk_buff *in_skb,
@@ -2002,7 +2002,7 @@ static int devinet_conf_proc(struct ctl_if (i ==IPV4_DEVCONF_PROXY_ARP -1 && new_value != old_value) { ifindex =devinet_conf_ifindex (net, cnf); -inet_netconf_notify_devconf (net,NETCONFA_PROXY_ARP , +inet_netconf_notify_devconf (net,NETCONFA_PROXY_NEIGH , ifindex, cnf); } }
PATCH 2/3 netconf: add support for IPv6 proxy_ndp
Need to be able to see changes to proxy NDP status on a per interface basis via netlink (analog to proxy_arp).
--- net/ipv6/addrconf.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-)
net/ipv6/addrconf.c +48 -1
@@ -442,6 +442,8 @@ static int inet6_netconf_msgsize_devconfif (type ==-1 || type ==NETCONFA_MC_FORWARDING ) size +=nla_total_size (4 );#endif +if (type ==-1 || type ==NETCONFA_PROXY_NEIGH ) + size +=nla_total_size (4 );return size; }
@@ -475,6 +477,10 @@ static int inet6_netconf_fill_devconf(st devconf->mc_forwarding) < 0) goto nla_put_failure;#endif +if ((type ==-1 || type ==NETCONFA_PROXY_NEIGH ) && +nla_put_s32 (skb,NETCONFA_PROXY_NEIGH , devconf->proxy_ndp) <0 ) + goto nla_put_failure; +return nlmsg_end (skb, nlh); nla_put_failure:
@@ -509,6 +515,7 @@ errout:static const struct nla_policy devconf_ipv6_policy[NETCONFA_MAX +1 ] = { [NETCONFA_IFINDEX ] = { .len =sizeof (int ) }, [NETCONFA_FORWARDING ] = { .len =sizeof (int ) }, + [NETCONFA_PROXY_NEIGH ] = { .len =sizeof (int ) }, }; static int inet6_netconf_get_devconf(struct sk_buff *in_skb,
@@ -4728,6 +4735,46 @@ int addrconf_sysctl_disable(struct ctl_treturn ret; } +static +int addrconf_sysctl_proxy_ndp (struct ctl_table *ctl,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +int *valp = ctl->data; +int ret; +int old, new; + + old = *valp; + ret =proc_dointvec (ctl, write, buffer, lenp, ppos); + new = *valp; + +if (write && old != new) { +struct net *net = ctl->extra2; + +if (!rtnl_trylock ()) +return restart_syscall (); + +if (valp == &net->ipv6.devconf_dflt->proxy_ndp) +inet6_netconf_notify_devconf (net,NETCONFA_PROXY_NEIGH , +NETCONFA_IFINDEX_DEFAULT , + net->ipv6.devconf_dflt); +else if (valp == &net->ipv6.devconf_all->proxy_ndp) +inet6_netconf_notify_devconf (net,NETCONFA_PROXY_NEIGH , +NETCONFA_IFINDEX_ALL , + net->ipv6.devconf_all); +else { +struct inet6_dev *idev = ctl->extra1; + +inet6_netconf_notify_devconf (net,NETCONFA_PROXY_NEIGH , + idev->dev->ifindex, + &idev->cnf); + } +rtnl_unlock (); + } + +return ret; +} + + static struct addrconf_sysctl_table { struct ctl_table_header *sysctl_header;
@@ -4914,7 +4961,7 @@ static struct addrconf_sysctl_table .data = &ipv6_devconf.proxy_ndp, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = addrconf_sysctl_proxy_ndp, }, { .procname = "accept_source_route",
Re: [PATCH net-next 2/3] netconf: add support for IPv6 proxy_ndp
Quoted 4 lines · Stephen Hemminger
Need to be able to see changes to proxy NDP status on a per interface basis via netlink (analog to
proxy_arp).Signed-off-by Stephen Hemminger <[email protected]>
Re: [PATCH net-next 2/3] netconf: add support for IPv6 proxy_ndp
In reply to Stephen HemmingerFrom: Stephen Hemminger <[email protected]>
Date: Tue, 17 Dec 2013 22:37:14 -0800
Quoted 4 lines
Need to be able to see changes to proxy NDP status on a per interface basis via netlink (analog to
proxy_arp).Signed-off-by Stephen Hemminger <[email protected]>
Applied.
PATCH 3/3 iproute2: add proxy_neigh attribute
In reply to Stephen HemmingerReport changes to proxy_arp/proxy_ndp attribute.
Patch assumes updated netconf.h from net-next (earlier patches).
--- ip/ipnetconf.c | 4 ++++ 1 file changed, 4 insertions(+)
ip/ipnetconf.c +4 -0
@@ -114,6 +114,10 @@ int print_netconf(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)fprintf (fp,"mc_forwarding %d " , *(int *)RTA_DATA (tb[NETCONFA_MC_FORWARDING ])); +if (tb[NETCONFA_PROXY_NEIGH ]) +fprintf (fp,"proxy_neigh %s " , + *(int *)RTA_DATA (tb[NETCONFA_PROXY_NEIGH ])?"on" :"off" ); +fprintf (fp,"\n" );fflush (fp);return 0 ;
Signature · 1 line
1.7.10.4
Quoted 13 lines · Stephen Hemminger
Use same field for both IPv4 (
proxy_arp) and IPv6 (proxy_ndp) so fix it before API is set to be a common nameSigned-off-by Stephen Hemminger <[email protected]>--- include/uapi/linux/netconf.h | 2 +- net/ipv4/devinet.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
include/uapi/linux/netconf.h enum { · line 19
Quoted 7 lines
include/uapi/linux/netconf.h +1
-1@@ -14,7 +14,7 @@ enum {NETCONFA_FORWARDING ,NETCONFA_RP_FILTER ,NETCONFA_MC_FORWARDING , -NETCONFA_PROXY_ARP , +NETCONFA_PROXY_NEIGH , __NETCONFA_MAX };
Can you do this? ;-> Why not #define NETCONFA_PROXY_NEIGH to be NETCONFA_PROXY_ARP
cheers,
jamal
Quoted 25 lines · On Wed, 18 Dec 2013 12:06:45 -0500 Jamal Hadi Salim <[email protected]> wrote:
Quoted 13 lines · Stephen Hemminger
Use same field for both IPv4 (
proxy_arp) and IPv6 (proxy_ndp) so fix it before API is set to be a common nameSigned-off-by Stephen Hemminger <[email protected]>--- include/uapi/linux/netconf.h | 2 +- net/ipv4/devinet.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)include/uapi/linux/netconf.h enum { · line 19
Quoted 7 lines
include/uapi/linux/netconf.h +1
-1@@ -14,7 +14,7 @@ enum {NETCONFA_FORWARDING ,NETCONFA_RP_FILTER ,NETCONFA_MC_FORWARDING , -NETCONFA_PROXY_ARP , +NETCONFA_PROXY_NEIGH , __NETCONFA_MAX };Can you do this? ;-> Why not #define
NETCONFA_PROXY_NEIGHto beNETCONFA_PROXY_ARP
Quoted 3 lines
cheers,
jamal
The patch is against un-released net-next and only changes something that was just added.
Quoted 4 lines · Stephen Hemminger
Use same field for both IPv4 (
proxy_arp) and IPv6 (proxy_ndp) so fix it before API is set to be a common nameSigned-off-by Stephen Hemminger <[email protected]>
From: Stephen Hemminger <[email protected]>
Date: Tue, 17 Dec 2013 22:35:52 -0800
Quoted 4 lines
Use same field for both IPv4 (
proxy_arp) and IPv6 (proxy_ndp) so fix it before API is set to be a common nameSigned-off-by Stephen Hemminger <[email protected]>
Applied.