From owner-svn-soc-all@freebsd.org  Mon Jun 29 19:03:24 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 117BA98F9AC
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 29 Jun 2015 19:03:24 +0000 (UTC)
 (envelope-from roam@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 02CED15CE
 for <svn-soc-all@FreeBSD.org>; Mon, 29 Jun 2015 19:03:24 +0000 (UTC)
 (envelope-from roam@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5TJ3NPx067463
 for <svn-soc-all@FreeBSD.org>; Mon, 29 Jun 2015 19:03:23 GMT
 (envelope-from roam@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5TJ3Nte067460
 for svn-soc-all@FreeBSD.org; Mon, 29 Jun 2015 19:03:23 GMT
 (envelope-from roam@FreeBSD.org)
Date: Mon, 29 Jun 2015 19:03:23 GMT
Message-Id: <201506291903.t5TJ3Nte067460@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 roam@FreeBSD.org using -f
From: roam@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r287737 - soc2015/roam/ng_ayiya
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Jun 2015 19:03:24 -0000

Author: roam
Date: Mon Jun 29 19:03:22 2015
New Revision: 287737
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287737

Log:
  Perform the link-local check in a sensible way.
  
  There's a macro for that!
  
  Pointed out by:	bz (mentor)
  Didn't read the next page of in6.h:	roam (myself)

Modified:
  soc2015/roam/ng_ayiya/ng_ayiya.c

Modified: soc2015/roam/ng_ayiya/ng_ayiya.c
==============================================================================
--- soc2015/roam/ng_ayiya/ng_ayiya.c	Mon Jun 29 19:03:19 2015	(r287736)
+++ soc2015/roam/ng_ayiya/ng_ayiya.c	Mon Jun 29 19:03:22 2015	(r287737)
@@ -456,7 +456,7 @@
 			 * client has set the appropriate tunnel endpoint IPv6
 			 * address on the interface by now.
 			 */
-			if ((htons(a->sin6_addr.s6_addr16[0]) & 0xFFC0) == 0xFE80)
+			if (IN6_IS_ADDR_LINKLOCAL(&a->sin6_addr))
 				continue;
 
 			const priv_p priv = NG_NODE_PRIVATE(node);