Date: Sat, 13 Dec 2008 23:24:04 +0000 (UTC) From: Qing Li <qingli@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r186065 - projects/arpv2_merge_1/sys/netinet6 Message-ID: <200812132324.mBDNO43J042894@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: qingli Date: Sat Dec 13 23:24:04 2008 New Revision: 186065 URL: http://svn.freebsd.org/changeset/base/186065 Log: The meaning of the return code from nd6_is_addr_neighbor() was reversed, causing all sorts of ... Modified: projects/arpv2_merge_1/sys/netinet6/nd6_nbr.c Modified: projects/arpv2_merge_1/sys/netinet6/nd6_nbr.c ============================================================================== --- projects/arpv2_merge_1/sys/netinet6/nd6_nbr.c Sat Dec 13 23:10:36 2008 (r186064) +++ projects/arpv2_merge_1/sys/netinet6/nd6_nbr.c Sat Dec 13 23:24:04 2008 (r186065) @@ -117,7 +117,7 @@ nd6_ns_input(struct mbuf *m, int off, in struct ifaddr *ifa = NULL; int lladdrlen = 0; int anycast = 0, proxy = 0, tentative = 0; - int tlladdr, error; + int tlladdr; union nd_opts ndopts; struct sockaddr_dl *proxydl = NULL; char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN]; @@ -171,8 +171,7 @@ nd6_ns_input(struct mbuf *m, int off, in src_sa6.sin6_family = AF_INET6; src_sa6.sin6_len = sizeof(src_sa6); src_sa6.sin6_addr = saddr6; - error = nd6_is_addr_neighbor(&src_sa6, ifp); - if (error) { + if (nd6_is_addr_neighbor(&src_sa6, ifp) == 0) { nd6log((LOG_INFO, "nd6_ns_input: " "NS packet from non-neighbor\n")); goto bad;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812132324.mBDNO43J042894>