Message ID | 1526608674-12702-32-git-send-email-gvrose8192@gmail.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <ovs-dev-bounces@openvswitch.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ndqEMt7S"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40nBZp2STNz9s28 for <incoming@patchwork.ozlabs.org>; Fri, 18 May 2018 12:14:58 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C1F94114A; Fri, 18 May 2018 01:59:13 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id C241D1116 for <dev@openvswitch.org>; Fri, 18 May 2018 01:58:57 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 80CCC6DB for <dev@openvswitch.org>; Fri, 18 May 2018 01:58:57 +0000 (UTC) Received: by mail-pg0-f49.google.com with SMTP id 11-v6so974518pge.2 for <dev@openvswitch.org>; Thu, 17 May 2018 18:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+n4LMYN2GxYv374ikJpaus4ggXX7aD+LICmF/ZSvxJg=; b=ndqEMt7Sd5do+mK0EMTBILHv2RjT+EYZqXEuKuCmnUBqsUGbaiCr1TZQj2YHp7hqOC Lia7bs6JpZQpzlTIAPpJrbQDYU08MI8HOLMwVTO9vObcTv86vLmpnAfAkxWJpweDJqg3 hB1AmZtfgcbCJWECxmYWx3vat6uZHtQwM4MgSJuzbP3wXK13vr2NtR5WaymqMOoawS3N fuK2pWOAS8hHcCzLY2/c7Z0ETDPIaASif7T5pjJT/+vV/H+QBbQpraLHIILw1q36ftyt woqrMHe2hDhdiQTd4xg4ndf8GWXhVWWytoVQ8Bqm1RF5PDp8qRG9/qNngqRYFv7GviuG 56Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+n4LMYN2GxYv374ikJpaus4ggXX7aD+LICmF/ZSvxJg=; b=KxRcNup0JKT0dlLbFzfnbdDGDrGTx3+JfonJ9RIXgSCGq0f4hi8tHGxgh88X3Mt1k7 3UTwP9VbxoRxpZBN4vIf2rAFvdS4URd8VfejPEa7MbB/vAvh94z87Q7gZHGr0lSAwGK2 Z6x6raDyWMIykyiA71DorW7YTd9VbSQwkYxprUC6lEj30MqwMcfLcwq5ERYRsM22lcz7 HmzRimOwuyCf8gbEJ7uUe1KukXkDsyeqjuoW1oLmUDfzTAuFFrOC++agbJb9Bxtzff31 ppnrkJjHrhmNSlb0mW9p9c9F3BgIKdLWUhMRHFYnCkS6pLqQY7Vt7JasX5kAZvF5/Zi1 8MCw== X-Gm-Message-State: ALKqPwdT0U+aXKExGFJgCc4/sP7jynPmolz0y/Zp0Hh+bu51Lkvb5T8g agQtFKRh1Kf27mBQds1iqoDisw== X-Google-Smtp-Source: AB8JxZr6tBu5Kwogdw/spbrWn5SOewQANcNjgc5y8hIHnzU2wrM9JLtXhYKzXquZodFkE2POnY8+0Q== X-Received: by 2002:a63:a06a:: with SMTP id u42-v6mr5626362pgn.389.1526608736766; Thu, 17 May 2018 18:58:56 -0700 (PDT) Received: from gizo.domain (97-115-125-157.ptld.qwest.net. [97.115.125.157]) by smtp.gmail.com with ESMTPSA id d15-v6sm10564908pfh.97.2018.05.17.18.58.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 May 2018 18:58:56 -0700 (PDT) From: Greg Rose <gvrose8192@gmail.com> To: dev@openvswitch.org Date: Thu, 17 May 2018 18:57:44 -0700 Message-Id: <1526608674-12702-32-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526608674-12702-1-git-send-email-gvrose8192@gmail.com> References: <1526608674-12702-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH V2 31/41] lib/dpif-netlink: Fix miscompare of gre ports X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: <ovs-dev.openvswitch.org> List-Unsubscribe: <https://mail.openvswitch.org/mailman/options/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe> List-Archive: <http://mail.openvswitch.org/pipermail/ovs-dev/> List-Post: <mailto:ovs-dev@openvswitch.org> List-Help: <mailto:ovs-dev-request@openvswitch.org?subject=help> List-Subscribe: <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org |
Series |
Add ERSPAN support
|
expand
|
diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index 607b497..20e1921 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -817,8 +817,6 @@ netdev_to_ovs_vport_type(const char *type) return OVS_VPORT_TYPE_STT; } else if (!strcmp(type, "geneve")) { return OVS_VPORT_TYPE_GENEVE; - } else if (strstr(type, "gre")) { - return OVS_VPORT_TYPE_GRE; } else if (!strcmp(type, "vxlan")) { return OVS_VPORT_TYPE_VXLAN; } else if (!strcmp(type, "lisp")) { @@ -829,6 +827,8 @@ netdev_to_ovs_vport_type(const char *type) return OVS_VPORT_TYPE_IP6ERSPAN; } else if (!strcmp(type, "ip6gre")) { return OVS_VPORT_TYPE_IP6GRE; + } else if (strcmp(type, "gre")) { + return OVS_VPORT_TYPE_GRE; } else { return OVS_VPORT_TYPE_UNSPEC; }
In netdev_to_ovs_vport_type() it checks for netdev types matching "gre" with a strstr(). This makes it match ip6gre as well and return OVS_VPORT_TYPE_GRE, which is clearly wrong. Move the usage of strstr() *after* all the exact matches with strcmp() to avoid the problem permanently because when I added the ip6gre type I ran into a very difficult to detect bug. Cc: Ben Pfaff <blp@ovn.org> Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- V2 - Removed strstr for gre completely as per Ben's feedback. --- lib/dpif-netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)