From patchwork Tue Dec 15 07:14:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mao,Yingming" X-Patchwork-Id: 1416315 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baidu.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cw8nf6m86z9sPB for ; Tue, 15 Dec 2020 18:21:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AE97D86C52; Tue, 15 Dec 2020 07:21:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dWKKK5A-3i_a; Tue, 15 Dec 2020 07:21:24 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3B0FA86C56; Tue, 15 Dec 2020 07:21:24 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 16FEAC0893; Tue, 15 Dec 2020 07:21:24 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 78947C013B for ; Tue, 15 Dec 2020 07:21:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5E97186C56 for ; Tue, 15 Dec 2020 07:21:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nfUA2wyBj-Oi for ; Tue, 15 Dec 2020 07:21:21 +0000 (UTC) X-Greylist: delayed 00:07:13 by SQLgrey-1.7.6 Received: from njjs-sys-mailin06.njjs.baidu.com (mx316.baidu.com [180.101.52.236]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3F02A86C52 for ; Tue, 15 Dec 2020 07:21:21 +0000 (UTC) Received: from bjhw-sys-rpm015653cc5.bjhw.baidu.com (unknown [10.168.53.59]) by njjs-sys-mailin06.njjs.baidu.com (Postfix) with ESMTP id B7CBF185C0031 for ; Tue, 15 Dec 2020 15:14:01 +0800 (CST) From: Mao YingMing To: ovs-dev@openvswitch.org Date: Tue, 15 Dec 2020 15:14:01 +0800 Message-Id: <1608016441-53372-1-git-send-email-maoyingming@baidu.com> Subject: [ovs-dev] [PATCH] dpctl: fix dpctl process command parameter error X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" fix the following error: """ $ ovs-appctl dpctl/dump-conntrack -m -s system@ovs-system zone=0 "dpctl/dump-conntrack" command takes at most 2 arguments ovs-appctl: ovs-vswitchd: server returned an error $ ovs-appctl dpctl/dump-flows -m --names system@ovs-system filter=in_port\(2\) type=ovs "dpctl/dump-flows" command takes at most 4 arguments ovs-appctl: ovs-vswitchd: server returned an error """ Signed-off-by: Mao YingMing --- lib/dpctl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/dpctl.c b/lib/dpctl.c index 3320281..3aa4b29 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -2533,15 +2533,16 @@ static const struct dpctl_command all_commands[] = { { "del-if", "dp iface...", 2, INT_MAX, dpctl_del_if, DP_RW }, { "set-if", "dp iface...", 2, INT_MAX, dpctl_set_if, DP_RW }, { "dump-dps", "", 0, 0, dpctl_dump_dps, DP_RO }, - { "show", "[dp...]", 0, INT_MAX, dpctl_show, DP_RO }, - { "dump-flows", "[dp] [filter=..] [type=..] [pmd=..]", - 0, 4, dpctl_dump_flows, DP_RO }, + { "show", "[-s] [dp...]", 0, INT_MAX, dpctl_show, DP_RO }, + { "dump-flows", "[-m] [--names] [dp] [filter=..] [type=..] [pmd=..]", + 0, 6, dpctl_dump_flows, DP_RO }, { "add-flow", "[dp] flow actions", 2, 3, dpctl_add_flow, DP_RW }, { "mod-flow", "[dp] flow actions", 2, 3, dpctl_mod_flow, DP_RW }, { "get-flow", "[dp] ufid", 1, 2, dpctl_get_flow, DP_RO }, { "del-flow", "[dp] flow", 1, 2, dpctl_del_flow, DP_RW }, { "del-flows", "[dp]", 0, 1, dpctl_del_flows, DP_RW }, - { "dump-conntrack", "[dp] [zone=N]", 0, 2, dpctl_dump_conntrack, DP_RO }, + { "dump-conntrack", "[-m] [-s] [dp] [zone=N]", + 0, 4, dpctl_dump_conntrack, DP_RO }, { "flush-conntrack", "[dp] [zone=N] [ct-tuple]", 0, 3, dpctl_flush_conntrack, DP_RW }, { "ct-stats-show", "[dp] [zone=N]",