From patchwork Tue Jul 12 06:56:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 647305 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 3rpdFp0tT0z9sCy for ; Tue, 12 Jul 2016 20:18:06 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 04DEA106EF; Tue, 12 Jul 2016 03:17:20 -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 23EA4106EB for ; Tue, 12 Jul 2016 03:17:19 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id AC401420233 for ; Tue, 12 Jul 2016 04:17:18 -0600 (MDT) X-ASG-Debug-ID: 1468318638-09eadd72160b650001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar5.cudamail.com with ESMTP id z7NxHLlX52qXR7B7 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Jul 2016 04:17:18 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO relay2-d.mail.gandi.net) (217.70.183.194) by mx3-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 12 Jul 2016 10:17:17 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at ovn.org designates 217.70.183.194 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.194 X-Barracuda-RBL-IP: 217.70.183.194 Received: from mfilter39-d.gandi.net (mfilter39-d.gandi.net [217.70.178.170]) by relay2-d.mail.gandi.net (Postfix) with ESMTP id 9C1B8C5B69 for ; Tue, 12 Jul 2016 12:17:16 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter39-d.gandi.net Received: from relay2-d.mail.gandi.net ([IPv6:::ffff:217.70.183.194]) by mfilter39-d.gandi.net (mfilter39-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id yEOfg7qYsJ4Q for ; Tue, 12 Jul 2016 12:17:15 +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 6E72FC5B5B for ; Tue, 12 Jul 2016 12:17:14 +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-711003272 X-CudaMail-DTE: 071216 X-CudaMail-Originating-IP: 217.70.183.194 Date: Mon, 11 Jul 2016 23:56:51 -0700 X-ASG-Orig-Subj: [##CM-V2-711003272##][ovn-ipv6 21/26] ovn-util: Add solicited node addresses to ipv6_netaddr. Message-Id: <1468306616-125783-22-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: 1468318638 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 21/26] ovn-util: Add solicited node addresses to ipv6_netaddr. 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" Every IPv6 host has a link-local solicited node multicast address for neighbor discovery. This commit defines the solicited node address for each IPv6 address added to a logical switch or router port. Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- ovn/lib/ovn-util.c | 4 ++++ ovn/lib/ovn-util.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ovn/lib/ovn-util.c b/ovn/lib/ovn-util.c index 3e0c138..7ad69ad 100644 --- a/ovn/lib/ovn-util.c +++ b/ovn/lib/ovn-util.c @@ -53,9 +53,12 @@ add_ipv6_netaddr(struct lport_addresses *laddrs, struct in6_addr addr, na->mask = ipv6_create_mask(plen); na->network = ipv6_addr_bitand(&addr, &na->mask); na->plen = plen; + in6_addr_solicited_node(&na->sn_addr, &addr); na->addr_s = xmalloc(INET6_ADDRSTRLEN); inet_ntop(AF_INET6, &addr, na->addr_s, INET6_ADDRSTRLEN); + na->sn_addr_s = xmalloc(INET6_ADDRSTRLEN); + inet_ntop(AF_INET6, &na->sn_addr, na->sn_addr_s, INET6_ADDRSTRLEN); na->network_s = xmalloc(INET6_ADDRSTRLEN); inet_ntop(AF_INET6, &na->network, na->network_s, INET6_ADDRSTRLEN); } @@ -189,6 +192,7 @@ destroy_lport_addresses(struct lport_addresses *laddrs) for (int i = 0; i < laddrs->n_ipv6_addrs; i++) { free(laddrs->ipv6_addrs[i].addr_s); + free(laddrs->ipv6_addrs[i].sn_addr_s); free(laddrs->ipv6_addrs[i].network_s); } free(laddrs->ipv6_addrs); diff --git a/ovn/lib/ovn-util.h b/ovn/lib/ovn-util.h index b550ece..e9f3ec2 100644 --- a/ovn/lib/ovn-util.h +++ b/ovn/lib/ovn-util.h @@ -34,10 +34,12 @@ struct ipv4_netaddr { struct ipv6_netaddr { struct in6_addr addr; /* fc00::1 */ struct in6_addr mask; /* ffff:ffff:ffff:ffff:: */ + struct in6_addr sn_addr; /* ff02:1:ff00::1 */ struct in6_addr network; /* fc00:: */ unsigned int plen; /* CIDR Prefix: 64 */ char *addr_s; /* "fc00::1" */ + char *sn_addr_s; /* "ff02:1:ff00::1" */ char *network_s; /* "fc00::" */ };