From patchwork Tue Jul 12 06:56:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 647299 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 3rpdF131TCz9s9N for ; Tue, 12 Jul 2016 20:17:25 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 96079106A8; Tue, 12 Jul 2016 03:17:05 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id EF93A106A4 for ; Tue, 12 Jul 2016 03:17:02 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 55C0916299A for ; Tue, 12 Jul 2016 04:17:02 -0600 (MDT) X-ASG-Debug-ID: 1468318621-0b32370af1026f0001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar6.cudamail.com with ESMTP id zs2LgRuXjuQk1Yuz (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Jul 2016 04:17:01 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO relay2-d.mail.gandi.net) (217.70.183.194) by mx3-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 12 Jul 2016 10:17:01 -0000 Received-SPF: pass (mx3-pf1.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 mfilter16-d.gandi.net (mfilter16-d.gandi.net [217.70.178.144]) by relay2-d.mail.gandi.net (Postfix) with ESMTP id BBC2FC5B0D for ; Tue, 12 Jul 2016 12:16:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter16-d.gandi.net Received: from relay2-d.mail.gandi.net ([IPv6:::ffff:217.70.183.194]) by mfilter16-d.gandi.net (mfilter16-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id FV3FHlamn2ED for ; Tue, 12 Jul 2016 12:16:58 +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 E62C2C5B2A for ; Tue, 12 Jul 2016 12:16:56 +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-V1-711003374 X-CudaMail-DTE: 071216 X-CudaMail-Originating-IP: 217.70.183.194 Date: Mon, 11 Jul 2016 23:56:33 -0700 X-ASG-Orig-Subj: [##CM-V1-711003374##][ovn-ipv6 03/26] ovn-northd: Fix comments about the flows. Message-Id: <1468306616-125783-4-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.2] X-Barracuda-Start-Time: 1468318621 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 03/26] ovn-northd: Fix comments about the flows. 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" References to the specifc tables should probably be dropped, since they'll continue to drift towards wrong. In the meantime, correct the ones that are there. Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- ovn/northd/ovn-northd.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index f4b4435..d0491ea 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -1814,7 +1814,7 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, ovn_lflow_add(lflows, od, S_SWITCH_IN_PORT_SEC_IP, 0, "1", "next;"); } - /* Ingress table 3: ARP responder, skip requests coming from localnet ports. + /* Ingress table 9: ARP responder, skip requests coming from localnet ports. * (priority 100). */ HMAP_FOR_EACH (op, key_node, ports) { if (!op->nbs) { @@ -1829,7 +1829,7 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, } } - /* Ingress table 5: ARP/ND responder, reply for known IPs. + /* Ingress table 9: ARP/ND responder, reply for known IPs. * (priority 50). */ HMAP_FOR_EACH (op, key_node, ports) { if (!op->nbs) { @@ -1916,7 +1916,7 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, } } - /* Ingress table 5: ARP/ND responder, by default goto next. + /* Ingress table 9: ARP/ND responder, by default goto next. * (priority 0)*/ HMAP_FOR_EACH (od, key_node, datapaths) { if (!od->nbs) { @@ -1926,7 +1926,7 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, ovn_lflow_add(lflows, od, S_SWITCH_IN_ARP_ND_RSP, 0, "1", "next;"); } - /* Ingress table 6: Destination lookup, broadcast and multicast handling + /* Ingress table 10: Destination lookup, broadcast and multicast handling * (priority 100). */ HMAP_FOR_EACH (op, key_node, ports) { if (!op->nbs) { @@ -1946,7 +1946,7 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, "outport = \""MC_FLOOD"\"; output;"); } - /* Ingress table 6: Destination lookup, unicast handling (priority 50), */ + /* Ingress table 10: Destination lookup, unicast handling (priority 50), */ HMAP_FOR_EACH (op, key_node, ports) { if (!op->nbs) { continue; @@ -1983,7 +1983,7 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, } } - /* Ingress table 6: Destination lookup for unknown MACs (priority 0). */ + /* Ingress table 10: Destination lookup for unknown MACs (priority 0). */ HMAP_FOR_EACH (od, key_node, datapaths) { if (!od->nbs) { continue; @@ -1995,9 +1995,9 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, } } - /* Egress table 2: Egress port security - IP (priority 0) - * port security L2 - multicast/broadcast (priority - * 100). */ + /* Egress tables 6: Egress port security - IP (priority 0) + * Egress table 7: Egress port security L2 - multicast/broadcast + * (priority 100). */ HMAP_FOR_EACH (od, key_node, datapaths) { if (!od->nbs) { continue; @@ -2008,10 +2008,10 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, "output;"); } - /* Egress table 2: Egress port security - IP (priorities 90 and 80) + /* Egress table 6: Egress port security - IP (priorities 90 and 80) * if port security enabled. * - * Egress table 3: Egress port security - L2 (priorities 50 and 150). + * Egress table 7: Egress port security - L2 (priorities 50 and 150). * * Priority 50 rules implement port security for enabled logical port. * @@ -2498,7 +2498,7 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, "ip", "inport = \"\"; ct_dnat;"); } - /* Logical router ingress table 2: IP Routing. + /* Logical router ingress table 4: IP Routing. * * A packet that arrives at this table is an IP packet that should be * routed to the address in ip4.dst. This table sets outport to the correct @@ -2531,7 +2531,7 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, } /* XXX destination unreachable */ - /* Local router ingress table 3: ARP Resolution. + /* Local router ingress table 5: ARP Resolution. * * Any packet that reaches this table is an IP packet whose next-hop IP * address is in reg0. (ip4.dst is the final destination.) This table @@ -2678,11 +2678,11 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, "get_arp(outport, reg0); next;"); } - /* Local router ingress table 4: ARP request. + /* Local router ingress table 6: ARP request. * * In the common case where the Ethernet destination has been resolved, - * this table outputs the packet (priority 100). Otherwise, it composes - * and sends an ARP request (priority 0). */ + * this table outputs the packet (priority 0). Otherwise, it composes + * and sends an ARP request (priority 100). */ HMAP_FOR_EACH (od, key_node, datapaths) { if (!od->nbr) { continue;