Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check scope id when we compare two AF_INET6 sockaddrs.

Browse Source 
XXX still not sure if it is enough, so I do not remove warning from
documentation yet.
This commit is contained in:
itojun 2000-06-10 08:01:07 +00:00
parent 1ba6c2716a
commit 20b4e05ffe
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/mountd/mountd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mountd.c,v 1.66 2000/06/10 07:04:14 itojun Exp $ */ /* $NetBSD: mountd.c,v 1.67 2000/06/10 08:01:07 itojun Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -51,7 +51,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95"; static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#else #else
__RCSID("$NetBSD: mountd.c,v 1.66 2000/06/10 07:04:14 itojun Exp $"); __RCSID("$NetBSD: mountd.c,v 1.67 2000/06/10 08:01:07 itojun Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -1422,6 +1422,9 @@ netpartcmp(struct sockaddr *s1, struct sockaddr *s2, int bitlen)
case AF_INET6: case AF_INET6:
src = &((struct sockaddr_in6 *)s1)->sin6_addr; src = &((struct sockaddr_in6 *)s1)->sin6_addr;
dst = &((struct sockaddr_in6 *)s2)->sin6_addr; dst = &((struct sockaddr_in6 *)s2)->sin6_addr;
if (((struct sockaddr_in6 *)s1)->sin6_scope_id !=
((struct sockaddr_in6 *)s2)->sin6_scope_id)
return 1;
if (bitlen > sizeof(((struct sockaddr_in6 *)s1)->sin6_addr) * 8) if (bitlen > sizeof(((struct sockaddr_in6 *)s1)->sin6_addr) * 8)
return 1; return 1;
break; break;
@ -1523,6 +1526,9 @@ sacmp(struct sockaddr *sa1, struct sockaddr *sa2)
p1 = &((struct sockaddr_in6 *)sa1)->sin6_addr; p1 = &((struct sockaddr_in6 *)sa1)->sin6_addr;
p2 = &((struct sockaddr_in6 *)sa2)->sin6_addr; p2 = &((struct sockaddr_in6 *)sa2)->sin6_addr;
len = 16; len = 16;
if (((struct sockaddr_in6 *)sa1)->sin6_scope_id !=
((struct sockaddr_in6 *)sa2)->sin6_scope_id)
return 1;
break; break;
default: default:
return 1; return 1;