From patchwork Tue Jul 12 06:56:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 647316 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 3rpdK36Whlz9s9N for ; Tue, 12 Jul 2016 20:20:55 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 690DA10882; 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 49DDD1075F 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 D40DF420247 for ; Tue, 12 Jul 2016 04:20:24 -0600 (MDT) X-ASG-Debug-ID: 1468318824-09eadd72160c2c0001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar5.cudamail.com with ESMTP id tpRE38981wV3Mhak (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 0DC054B661A for ; Tue, 12 Jul 2016 12:17:12 +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 79CECC5B5B for ; Tue, 12 Jul 2016 12:17:12 +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-711003381 X-CudaMail-DTE: 071216 X-CudaMail-Originating-IP: 217.70.178.86 Date: Mon, 11 Jul 2016 23:56:49 -0700 X-ASG-Orig-Subj: [##CM-V2-711003381##][ovn-ipv6 19/26] packets: Define RSO flags. Message-Id: <1468306616-125783-20-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 19/26] packets: Define RSO flags. 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" Use #define's as opposed to magic numbers. Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- lib/packets.h | 4 ++++ ovn/controller/pinctrl.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/packets.h b/lib/packets.h index 28b742d..617f058 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -840,6 +840,10 @@ struct ovs_nd_msg { }; BUILD_ASSERT_DECL(ND_MSG_LEN == sizeof(struct ovs_nd_msg)); +#define ND_RSO_ROUTER 0x80000000 +#define ND_RSO_SOLICITED 0x40000000 +#define ND_RSO_OVERRIDE 0x20000000 + /* * Use the same struct for MLD and MLD2, naming members as the defined fields in * in the corresponding version of the protocol, though they are reserved in the diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index 37d3f41..fdf21c7 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -964,11 +964,14 @@ pinctrl_handle_na(const struct flow *ip_flow, struct dp_packet packet; dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub); - /* Frame the NA packet with RSO=011. */ + /* xxx These flags are not exactly correct. Look at section 7.2.4 + * xxx of RFC 4861. For example, we need to set ND_RSO_ROUTER for + * xxx router's interfaces and ND_RSO_SOLICITED only if it was + * xxx requested. */ compose_nd_adv(&packet, ip_flow->dl_dst, ip_flow->dl_src, &ip_flow->nd_target, &ip_flow->ipv6_src, - htonl(0x60000000)); + htonl(ND_RSO_SOLICITED | ND_RSO_OVERRIDE)); /* Reload previous packet metadata. */ uint64_t ofpacts_stub[4096 / 8];