From patchwork Tue Jul 12 06:56:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 647317 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 3rpdK9759Qz9s9N for ; Tue, 12 Jul 2016 20:21:01 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id BAE841088F; Tue, 12 Jul 2016 03:20:27 -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 654CA10868 for ; Tue, 12 Jul 2016 03:20:25 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id DFAB9420623 for ; Tue, 12 Jul 2016 04:20:24 -0600 (MDT) X-ASG-Debug-ID: 1468318824-09eadd72130c2b0001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar5.cudamail.com with ESMTP id eE8leRBhhUKbw3vg (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Jul 2016 04:20:24 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO slow1-d.mail.gandi.net) (217.70.178.86) by mx3-pf2.cudamail.com with SMTP; 12 Jul 2016 10:20:24 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at ovn.org designates 217.70.178.86 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.178.86 X-Barracuda-RBL-IP: 217.70.178.86 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by slow1-d.mail.gandi.net (Postfix) with ESMTP id 4E6984B65E0 for ; Tue, 12 Jul 2016 12:17:11 +0200 (CEST) X-Originating-IP: 98.234.50.139 Received: from localhost.localdomain (unknown [98.234.50.139]) (Authenticated sender: jpettit@ovn.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id B87D8C5B5C for ; Tue, 12 Jul 2016 12:17:10 +0200 (CEST) X-CudaMail-Envelope-Sender: jpettit@ovn.org From: Justin Pettit To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-711003382 X-CudaMail-DTE: 071216 X-CudaMail-Originating-IP: 217.70.178.86 Date: Mon, 11 Jul 2016 23:56:47 -0700 X-ASG-Orig-Subj: [##CM-V2-711003382##][ovn-ipv6 17/26] packets: Introduce xor and is_zero functions on IPv6 addresses. Message-Id: <1468306616-125783-18-git-send-email-jpettit@ovn.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468306616-125783-1-git-send-email-jpettit@ovn.org> References: <1468306616-125783-1-git-send-email-jpettit@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1468318824 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 Subject: [ovs-dev] [ovn-ipv6 17/26] packets: Introduce xor and is_zero functions on IPv6 addresses. 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: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" These will have callers later. Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- lib/packets.c | 38 ++++++++++++++++++++++++++++++++++++++ lib/packets.h | 3 +++ 2 files changed, 41 insertions(+) diff --git a/lib/packets.c b/lib/packets.c index 9e4d0e7..9b34961 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -693,6 +693,44 @@ struct in6_addr ipv6_addr_bitand(const struct in6_addr *a, return dst; } +struct in6_addr ipv6_addr_bitxor(const struct in6_addr *a, + const struct in6_addr *b) +{ + int i; + struct in6_addr dst; + +#ifdef s6_addr32 + for (i=0; i<4; i++) { + dst.s6_addr32[i] = a->s6_addr32[i] ^ b->s6_addr32[i]; + } +#else + for (i=0; i<16; i++) { + dst.s6_addr[i] = a->s6_addr[i] ^ b->s6_addr[i]; + } +#endif + + return dst; +} + +bool ipv6_is_zero(const struct in6_addr *a) +{ +#ifdef s6_addr32 + for (int i = 0; i < 4; i++) { + if (a->s6_addr32[i]) { + return false; + } + } +#else + for (int i = 0; i < 16; i++) { + if (a->s6_addr[i]) { + return false; + } + } +#endif + + return true; +} + /* Returns an in6_addr consisting of 'mask' high-order 1-bits and 128-N * low-order 0-bits. */ struct in6_addr diff --git a/lib/packets.h b/lib/packets.h index 06166de..2043175 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -1027,6 +1027,9 @@ void ipv6_format_masked(const struct in6_addr *addr, const char * ipv6_string_mapped(char *addr_str, const struct in6_addr *addr); struct in6_addr ipv6_addr_bitand(const struct in6_addr *src, const struct in6_addr *mask); +struct in6_addr ipv6_addr_bitxor(const struct in6_addr *a, + const struct in6_addr *b); +bool ipv6_is_zero(const struct in6_addr *a); struct in6_addr ipv6_create_mask(int mask); int ipv6_count_cidr_bits(const struct in6_addr *netmask); bool ipv6_is_cidr(const struct in6_addr *netmask);