From patchwork Wed Jul 20 05:16:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 650562 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rvQB173nnz9sR8 for ; Wed, 20 Jul 2016 15:16:24 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 55F6A10B1B; Tue, 19 Jul 2016 22:16:22 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 73D4B10B17 for ; Tue, 19 Jul 2016 22:16:21 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 6A95E4200DD for ; Tue, 19 Jul 2016 23:16:20 -0600 (MDT) X-ASG-Debug-ID: 1468991779-09eadd7a273d150001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id 1QEIDYzFk5HWgkrZ (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 19 Jul 2016 23:16:19 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO relay6-d.mail.gandi.net) (217.70.183.198) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 20 Jul 2016 05:16:19 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at ovn.org designates 217.70.183.198 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.198 X-Barracuda-RBL-IP: 217.70.183.198 Received: from mfilter30-d.gandi.net (mfilter30-d.gandi.net [217.70.178.161]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id 2E766FB8A3; Wed, 20 Jul 2016 07:16:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter30-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter30-d.gandi.net (mfilter30-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id LpagK2TzeW5Y; Wed, 20 Jul 2016 07:16:15 +0200 (CEST) X-Originating-IP: 98.234.50.139 Received: from [10.0.1.27] (unknown [98.234.50.139]) (Authenticated sender: jpettit@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 113FFFB882; Wed, 20 Jul 2016 07:16:14 +0200 (CEST) Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-718090384 X-CudaMail-DTE: 071916 X-CudaMail-Originating-IP: 217.70.183.198 X-CudaMail-Envelope-Sender: jpettit@ovn.org X-ASG-Orig-Subj: [##CM-E2-718090384##]Re: [ovs-dev] [ovn-ipv6 20/26] packets: Add in6_is_lla() function. From: Justin Pettit In-Reply-To: <20160713195729.GC26424@ovn.org> Date: Tue, 19 Jul 2016 22:16:12 -0700 Message-Id: References: <1468306616-125783-1-git-send-email-jpettit@ovn.org> <1468306616-125783-21-git-send-email-jpettit@ovn.org> <20160713195729.GC26424@ovn.org> To: Ben Pfaff X-Mailer: Apple Mail (2.3124) X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1468991779 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: dev@openvswitch.org Subject: Re: [ovs-dev] [ovn-ipv6 20/26] packets: Add in6_is_lla() function. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@openvswitch.org Sender: "dev" > On Jul 13, 2016, at 12:57 PM, Ben Pfaff wrote: > > On Mon, Jul 11, 2016 at 11:56:50PM -0700, Justin Pettit wrote: >> This will have a caller in a future commit. >> >> Signed-off-by: Justin Pettit > >> +static inline bool >> +in6_is_lla(struct in6_addr *addr) >> +{ >> + return addr->s6_addr32[0] == htonl(0xfe800000) && !(addr->s6_addr32[1]); >> +} > > One more thing: not all implementations have s6_addr32, so we probably > need a fallback. Good point. I've addressed that as well as your previous comments. --Justin -=-=-=-=-=-=-=-=-=- diff --git a/lib/packets.h b/lib/packets.h index 02028c9..8f11e2c 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -980,10 +980,16 @@ in6_generate_lla(struct eth_addr ea, struct in6_addr *lla) taddr->be16[7] = ea.be16[2]; } +/* Returns true if 'addr' is a link local address. Otherwise, false. */ static inline bool in6_is_lla(struct in6_addr *addr) { +#ifdef s6_addr32 return addr->s6_addr32[0] == htonl(0xfe800000) && !(addr->s6_addr32[1]); +#else + return addr->s6_addr[0] == htons(0xfe80) && + !(addr->s6_addr[1] | addr->s6_addr[2] | addr->s6_addr[3]); +#endif } static inline void