svn commit: r258933 - user/ae/inet6/sys/netinet6

[Andrey V. Elsukov]

Author: ae
Date: Wed Dec  4 20:02:16 2013
New Revision: 258933
URL: http://svnweb.freebsd.org/changeset/base/258933

Log:
  Compare zone indexes only when connection has link-local scope.

Modified:
  user/ae/inet6/sys/netinet6/in6_pcb.c

Modified: user/ae/inet6/sys/netinet6/in6_pcb.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_pcb.c	Wed Dec  4 19:51:44 2013	(r258932)
+++ user/ae/inet6/sys/netinet6/in6_pcb.c	Wed Dec  4 20:02:16 2013	(r258933)
@@ -973,9 +973,8 @@ in6_pcblookup_hash_locked(struct inpcbin
 			continue;
 		if (IN6_ARE_ADDR_EQUAL(&inp->in6p_faddr, faddr) &&
 		    IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr) &&
-		    inp->inp_fport == fport &&
-		    inp->inp_lport == lport &&
-		    inp->in6p_zoneid == zoneid) {
+		    inp->inp_fport == fport && inp->inp_lport == lport && (
+			inp->in6p_zoneid == 0 || inp->in6p_zoneid == zoneid)) {
 			/*
 			 * XXX We should be able to directly return
 			 * the inp here, without any checks.
@@ -1031,8 +1030,9 @@ in6_pcblookup_hash_locked(struct inpcbin
 					continue;
 			}
 
-			if (IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr) &&
-			    inp->in6p_zoneid == zoneid) {
+			if (IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr) && (
+			    inp->in6p_zoneid == 0 ||
+			    inp->in6p_zoneid == zoneid)) {
 				if (injail)
 					return (inp);
 				else