* [PATCH net-next v3] ipv6: enable anycast addresses as source addresses for datagrams
@ 2014-01-22 3:30 Francois-Xavier Le Bail
2014-01-22 6:46 ` François-Xavier Le Bail
2014-01-23 5:57 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Francois-Xavier Le Bail @ 2014-01-22 3:30 UTC (permalink / raw)
To: netdev; +Cc: Hannes Frederic Sowa, David Stevens, David Miller
This change allows to consider an anycast address valid as source address
when given via an IPV6_PKTINFO or IPV6_2292PKTINFO ancillary data item.
So, when sending a datagram with ancillary data, the unicast and anycast
addresses are handled in the same way.
- Adds ipv6_chk_acast_addr_src() to check if an anycast address is link-local
on given interface or is global.
- Uses it in ip6_datagram_send_ctl().
Signed-off-by: Francois-Xavier Le Bail <fx.lebail@yahoo.com>
---
v3: Consideration of Hannes's review (thanks!):
- Uses only ipv6_chk_acast_addr (rcu_read_lock needed).
Typical usage :
A server uses IPV6_RECVPKTINFO socket option to get ancillary data with
recvmsg() and can use sendmsg() to reply with anycast adress as source address
in the same way it does for unicast.
include/net/addrconf.h | 5 +++--
net/ipv6/anycast.c | 11 +++++++++++
net/ipv6/datagram.c | 4 +++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 66c4a44..50e39a8 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -205,8 +205,9 @@ void ipv6_sock_ac_close(struct sock *sk);
int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr);
int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);
bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
- const struct in6_addr *addr);
-
+ const struct in6_addr *addr);
+bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev,
+ const struct in6_addr *addr);
/* Device notifier */
int register_inet6addr_notifier(struct notifier_block *nb);
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index 5a80f15..3139580 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -383,6 +383,17 @@ bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
return found;
}
+/* check if this anycast address is link-local on given interface or
+ * is global
+ */
+bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev,
+ const struct in6_addr *addr)
+{
+ if (ipv6_addr_type(addr) & IPV6_ADDR_LINKLOCAL)
+ return ipv6_chk_acast_addr(net, dev, addr);
+ else
+ return ipv6_chk_acast_addr(net, NULL, addr);
+}
#ifdef CONFIG_PROC_FS
struct ac6_iter_state {
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index cd8699b..2615197 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -689,7 +689,9 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk,
int strict = __ipv6_addr_src_scope(addr_type) <= IPV6_ADDR_SCOPE_LINKLOCAL;
if (!(inet_sk(sk)->freebind || inet_sk(sk)->transparent) &&
!ipv6_chk_addr(net, &src_info->ipi6_addr,
- strict ? dev : NULL, 0))
+ strict ? dev : NULL, 0) &&
+ !ipv6_chk_acast_addr_src(net, dev,
+ &src_info->ipi6_addr))
err = -EINVAL;
else
fl6->saddr = src_info->ipi6_addr;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v3] ipv6: enable anycast addresses as source addresses for datagrams
2014-01-22 3:30 [PATCH net-next v3] ipv6: enable anycast addresses as source addresses for datagrams Francois-Xavier Le Bail
@ 2014-01-22 6:46 ` François-Xavier Le Bail
2014-01-23 5:57 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: François-Xavier Le Bail @ 2014-01-22 6:46 UTC (permalink / raw)
To: netdev; +Cc: Hannes Frederic Sowa, David Stevens, David Miller
On Tue, 1/21/14, Francois-Xavier Le Bail <fx.lebail@yahoo.com> wrote:
> Subject: [PATCH net-next v3] ipv6: enable anycast addresses as source addresses for datagrams
I am going to send a v4 (better style).
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v3] ipv6: enable anycast addresses as source addresses for datagrams
2014-01-22 3:30 [PATCH net-next v3] ipv6: enable anycast addresses as source addresses for datagrams Francois-Xavier Le Bail
2014-01-22 6:46 ` François-Xavier Le Bail
@ 2014-01-23 5:57 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-01-23 5:57 UTC (permalink / raw)
To: fx.lebail; +Cc: netdev, hannes, dlstevens
From: Francois-Xavier Le Bail <fx.lebail@yahoo.com>
Date: Wed, 22 Jan 2014 04:30:50 +0100
> This change allows to consider an anycast address valid as source address
> when given via an IPV6_PKTINFO or IPV6_2292PKTINFO ancillary data item.
> So, when sending a datagram with ancillary data, the unicast and anycast
> addresses are handled in the same way.
>
> - Adds ipv6_chk_acast_addr_src() to check if an anycast address is link-local
> on given interface or is global.
> - Uses it in ip6_datagram_send_ctl().
>
> Signed-off-by: Francois-Xavier Le Bail <fx.lebail@yahoo.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-23 5:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-22 3:30 [PATCH net-next v3] ipv6: enable anycast addresses as source addresses for datagrams Francois-Xavier Le Bail
2014-01-22 6:46 ` François-Xavier Le Bail
2014-01-23 5:57 ` David Miller
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).