From patchwork Tue Sep 29 22:10:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 524035 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 7C2391400B7 for ; Wed, 30 Sep 2015 08:11:25 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 19880108D4; Tue, 29 Sep 2015 15:11:23 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 9C457108D2 for ; Tue, 29 Sep 2015 15:11:21 -0700 (PDT) Received: from bar3.cudamail.com (bar1 [192.168.15.1]) by mx3v1.cudamail.com (Postfix) with ESMTP id 265C3618A7B for ; Tue, 29 Sep 2015 16:11:21 -0600 (MDT) X-ASG-Debug-ID: 1443564680-03dd7b4f9e093d0001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar3.cudamail.com with ESMTP id MZ239dpkR3E4TFSu (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 29 Sep 2015 16:11:20 -0600 (MDT) X-Barracuda-Envelope-From: cascardo@redhat.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mx1.redhat.com) (209.132.183.28) by mx3-pf3.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 29 Sep 2015 22:11:19 -0000 Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at _spf1.redhat.com designates 209.132.183.28 as permitted sender) X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-Barracuda-RBL-IP: 209.132.183.28 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 90B8B550D3 for ; Tue, 29 Sep 2015 22:11:19 +0000 (UTC) Received: from indiana.gru.redhat.com ([10.96.73.207]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8TMBEdJ014409 for ; Tue, 29 Sep 2015 18:11:18 -0400 X-CudaMail-Envelope-Sender: cascardo@redhat.com From: Thadeu Lima de Souza Cascardo To: dev@openvswitch.org X-CudaMail-MID: CM-V3-928074909 X-CudaMail-DTE: 092915 X-CudaMail-Originating-IP: 209.132.183.28 Date: Tue, 29 Sep 2015 19:10:58 -0300 X-ASG-Orig-Subj: [##CM-V3-928074909##][RFC PATCH 7/7] tnl-ports: add IPv6 support Message-Id: <1443564658-12251-5-git-send-email-cascardo@redhat.com> In-Reply-To: <1443564658-12251-1-git-send-email-cascardo@redhat.com> References: <1443564658-12251-1-git-send-email-cascardo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-GBUdb-Analysis: 0, 209.132.183.28, Ugly c=0.313739 p=-0.333333 Source Normal X-MessageSniffer-Rules: 0-0-0-12125-c X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1443564680 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.23026 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Subject: [ovs-dev] [RFC PATCH 7/7] tnl-ports: add IPv6 support 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" Retrieve interfaces IPv6 addresses, and store IPv4 addresses as IPv4-mapped IPv6 addresses. Signed-off-by: Thadeu Lima de Souza Cascardo --- lib/tnl-ports.c | 72 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c index 60dc06f..c82f018 100644 --- a/lib/tnl-ports.c +++ b/lib/tnl-ports.c @@ -39,7 +39,8 @@ static struct classifier cls; /* Tunnel ports. */ struct ip_device { struct netdev *dev; struct eth_addr mac; - ovs_be32 addr; + ovs_be32 addr4; + struct in6_addr addr6; uint64_t change_seq; struct ovs_list node; char dev_name[IFNAMSIZ]; @@ -80,13 +81,18 @@ tnl_port_free(struct tnl_port_in *p) static void tnl_port_init_flow(struct flow *flow, struct eth_addr mac, - ovs_be32 addr, ovs_be16 udp_port) + struct in6_addr *addr, ovs_be16 udp_port) { memset(flow, 0, sizeof *flow); - flow->dl_type = htons(ETH_TYPE_IP); flow->dl_dst = mac; - flow->nw_dst = addr; + if (IN6_IS_ADDR_V4MAPPED(addr)) { + flow->dl_type = htons(ETH_TYPE_IP); + flow->nw_dst = in6_addr_get_mapped_ipv4(addr); + } else { + flow->dl_type = htons(ETH_TYPE_IPV6); + flow->ipv6_dst = *addr; + } if (udp_port) { flow->nw_proto = IPPROTO_UDP; @@ -97,7 +103,7 @@ tnl_port_init_flow(struct flow *flow, struct eth_addr mac, } static void -map_insert(odp_port_t port, struct eth_addr mac, ovs_be32 addr, +map_insert(odp_port_t port, struct eth_addr mac, struct in6_addr *addr, ovs_be16 udp_port, const char dev_name[]) { const struct cls_rule *cr; @@ -121,7 +127,11 @@ map_insert(odp_port_t port, struct eth_addr mac, ovs_be32 addr, match.wc.masks.nw_proto = 0xff; match.wc.masks.nw_frag = 0xff; /* XXX: No fragments support. */ match.wc.masks.tp_dst = OVS_BE16_MAX; - match.wc.masks.nw_dst = OVS_BE32_MAX; + if (IN6_IS_ADDR_V4MAPPED(addr)) { + match.wc.masks.nw_dst = OVS_BE32_MAX; + } else { + match.wc.masks.ipv6_dst = in6addr_exact; + } match.wc.masks.vlan_tci = OVS_BE16_MAX; memset(&match.wc.masks.dl_dst, 0xff, sizeof (struct eth_addr)); @@ -154,8 +164,16 @@ tnl_port_map_insert(odp_port_t port, list_insert(&port_list, &p->node); LIST_FOR_EACH(ip_dev, node, &addr_list) { - map_insert(p->port, ip_dev->mac, ip_dev->addr, - p->udp_port, p->dev_name); + if (ip_dev->addr4 != INADDR_ANY) { + struct in6_addr addr4; + in6_addr_set_mapped_ipv4(&addr4, ip_dev->addr4); + map_insert(p->port, ip_dev->mac, &addr4, + p->udp_port, p->dev_name); + } + if (ipv6_addr_is_set(&ip_dev->addr6)) { + map_insert(p->port, ip_dev->mac, &ip_dev->addr6, + p->udp_port, p->dev_name); + } } out: @@ -175,7 +193,7 @@ tnl_port_unref(const struct cls_rule *cr) } static void -map_delete(struct eth_addr mac, ovs_be32 addr, ovs_be16 udp_port) +map_delete(struct eth_addr mac, struct in6_addr *addr, ovs_be16 udp_port) { const struct cls_rule *cr; struct flow flow; @@ -206,7 +224,14 @@ tnl_port_map_delete(ovs_be16 udp_port) goto out; } LIST_FOR_EACH(ip_dev, node, &addr_list) { - map_delete(ip_dev->mac, ip_dev->addr, udp_port); + if (ip_dev->addr4 != INADDR_ANY) { + struct in6_addr addr4; + in6_addr_set_mapped_ipv4(&addr4, ip_dev->addr4); + map_delete(ip_dev->mac, &addr4, udp_port); + } + if (ipv6_addr_is_set(&ip_dev->addr6)) { + map_delete(ip_dev->mac, &ip_dev->addr6, udp_port); + } } free(p); @@ -301,8 +326,16 @@ map_insert_ipdev(struct ip_device *ip_dev) struct tnl_port *p; LIST_FOR_EACH(p, node, &port_list) { - map_insert(p->port, ip_dev->mac, ip_dev->addr, - p->udp_port, p->dev_name); + if (ip_dev->addr4 != INADDR_ANY) { + struct in6_addr addr4; + in6_addr_set_mapped_ipv4(&addr4, ip_dev->addr4); + map_insert(p->port, ip_dev->mac, &addr4, + p->udp_port, p->dev_name); + } + if (ipv6_addr_is_set(&ip_dev->addr6)) { + map_insert(p->port, ip_dev->mac, &ip_dev->addr6, + p->udp_port, p->dev_name); + } } } @@ -313,6 +346,7 @@ insert_ipdev(const char dev_name[]) enum netdev_flags flags; struct netdev *dev; int error; + int error4, error6; error = netdev_open(dev_name, NULL, &dev); if (error) { @@ -332,8 +366,9 @@ insert_ipdev(const char dev_name[]) if (error) { return; } - error = netdev_get_in4(ip_dev->dev, (struct in_addr *)&ip_dev->addr, NULL); - if (error) { + error4 = netdev_get_in4(ip_dev->dev, (struct in_addr *)&ip_dev->addr4, NULL); + error6 = netdev_get_in6(ip_dev->dev, &ip_dev->addr6); + if (error4 && error6) { return; } ovs_strlcpy(ip_dev->dev_name, netdev_get_name(dev), sizeof ip_dev->dev_name); @@ -348,7 +383,14 @@ delete_ipdev(struct ip_device *ip_dev) struct tnl_port *p; LIST_FOR_EACH(p, node, &port_list) { - map_delete(ip_dev->mac, ip_dev->addr, p->udp_port); + if (ip_dev->addr4 != INADDR_ANY) { + struct in6_addr addr4; + in6_addr_set_mapped_ipv4(&addr4, ip_dev->addr4); + map_delete(ip_dev->mac, &addr4, p->udp_port); + } + if (ipv6_addr_is_set(&ip_dev->addr6)) { + map_delete(ip_dev->mac, &ip_dev->addr6, p->udp_port); + } } list_remove(&ip_dev->node);