Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 29 Jan 2013 19:55:53 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r246088 - user/ae/inet6/sys/netinet6
Message-ID:  <201301291955.r0TJtrCv031222@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ae
Date: Tue Jan 29 19:55:53 2013
New Revision: 246088
URL: http://svnweb.freebsd.org/changeset/base/246088

Log:
  The in6ifa_ifwithaddr function now takes as arguments to lookup a
  pointer to the struct in6_addr and zone id. This allows use it without
  need of fill sockaddr_in6 structure, when we operate with a in6_addr.

Modified:
  user/ae/inet6/sys/netinet6/in6.c
  user/ae/inet6/sys/netinet6/in6_pcb.c
  user/ae/inet6/sys/netinet6/in6_var.h

Modified: user/ae/inet6/sys/netinet6/in6.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6.c	Tue Jan 29 19:06:16 2013	(r246087)
+++ user/ae/inet6/sys/netinet6/in6.c	Tue Jan 29 19:55:53 2013	(r246088)
@@ -1908,19 +1908,15 @@ in6ifa_ifpwithaddr(struct ifnet *ifp, st
  * ifaddr is returned referenced.
  */
 struct in6_ifaddr *
-in6ifa_ifwithaddr(const struct sockaddr_in6 *sa6)
+in6ifa_ifwithaddr(const struct in6_addr *addr, uint32_t zoneid)
 {
 	struct in6_ifaddr *ia;
 
 	IN6_IFADDR_RLOCK();
-	LIST_FOREACH(ia, IN6ADDR_HASH(&sa6->sin6_addr), ia6_hash) {
-		if (IN6_ARE_ADDR_EQUAL(IA6_IN6(ia), &sa6->sin6_addr)) {
-			/*
-			 * XXX: should we determine the scope and compare
-			 * sin6_scope_id with corresponding zone id?
-			 */
-			if (sa6->sin6_scope_id != 0 &&
-			    sa6->sin6_scope_id != in6_getlinkzone(ia->ia_ifp))
+	LIST_FOREACH(ia, IN6ADDR_HASH(addr), ia6_hash) {
+		if (IN6_ARE_ADDR_EQUAL(IA6_IN6(ia), addr)) {
+			if (zoneid != 0 &&
+			    zoneid != ia->ia_addr.sin6_scope_id)
 				continue;
 			ifa_ref(ia);
 			break;

Modified: user/ae/inet6/sys/netinet6/in6_pcb.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_pcb.c	Tue Jan 29 19:06:16 2013	(r246087)
+++ user/ae/inet6/sys/netinet6/in6_pcb.c	Tue Jan 29 19:55:53 2013	(r246088)
@@ -164,7 +164,9 @@ in6_pcbbind(register struct inpcb *inp, 
 			struct in6_ifaddr *ifa;
 
 			sin6->sin6_port = 0;		/* yech... */
-			if ((ifa = in6ifa_ifwithaddr(sin6)) == NULL &&
+			ifa = in6ifa_ifwithaddr(&sin6->sin6_addr,
+			    sin6->sin6_scope_id);
+			if (ifa == NULL &&
 			    (inp->inp_flags & INP_BINDANY) == 0) {
 				return (EADDRNOTAVAIL);
 			}

Modified: user/ae/inet6/sys/netinet6/in6_var.h
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_var.h	Tue Jan 29 19:06:16 2013	(r246087)
+++ user/ae/inet6/sys/netinet6/in6_var.h	Tue Jan 29 19:55:53 2013	(r246088)
@@ -801,7 +801,7 @@ void	in6_setmaxmtu(void);
 int	in6_if2idlen(struct ifnet *);
 struct in6_ifaddr *in6ifa_ifpforlinklocal(struct ifnet *, int);
 struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, struct in6_addr *);
-struct in6_ifaddr *in6ifa_ifwithaddr(const struct sockaddr_in6 *);
+struct in6_ifaddr *in6ifa_ifwithaddr(const struct in6_addr *, uint32_t);
 char	*ip6_sprintf(char *, const struct in6_addr *);
 int	in6_addr2zoneid(struct ifnet *, struct in6_addr *, u_int32_t *);
 int	in6_matchlen(struct in6_addr *, struct in6_addr *);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301291955.r0TJtrCv031222>