d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we don't need to make fake sockaddr_in6 to compare subject address.

Browse Source 
MFC after:	1 week
This commit is contained in:
Hajimu UMEMOTO 2005-01-21 18:12:46 +00:00
parent e4eb384b47
commit 5b8c5ac438
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/netinet6/icmp6.c
View File

@ -1170,7 +1170,6 @@ ni6_input(m, off)
int addrs; /* for NI_QTYPE_NODEADDR */
struct ifnet *ifp = NULL; /* for NI_QTYPE_NODEADDR */
struct sockaddr_in6 sin6_sbj; /* subject address */
struct sockaddr_in6 sin6_d;
struct ip6_hdr *ip6;
int oldfqdn = 0; /* if 1, return pascal string (03 draft) */
char *subj = NULL;
@ -1187,17 +1186,6 @@ ni6_input(m, off)
}
#endif
bzero(&sin6_d, sizeof(sin6_d));
sin6_d.sin6_family = AF_INET6; /* not used, actually */
sin6_d.sin6_len = sizeof(sin6_d); /* ditto */
sin6_d.sin6_addr = ip6->ip6_dst;
if (in6_addr2zoneid(m->m_pkthdr.rcvif, &ip6->ip6_dst,
&sin6_d.sin6_scope_id)) {
goto bad;
}
if (in6_embedscope(&sin6_d.sin6_addr, &sin6_d, NULL, NULL))
goto bad; /* XXX should not happen */
/*
* Validate IPv6 destination address.
*
@ -1286,7 +1274,8 @@ ni6_input(m, off)
goto bad; /* XXX should not happen */
subj = (char *)&sin6_sbj;
if (SA6_ARE_ADDR_EQUAL(&sin6_sbj, &sin6_d))
if (IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst,
&sin6_sbj.sin6_addr))
break;
/*