From patchwork Wed May 30 19:11:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Harold X-Patchwork-Id: 922967 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="J30A8w7Q"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40x0ZR2QSyz9s08 for ; Thu, 31 May 2018 05:11:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753651AbeE3TLk (ORCPT ); Wed, 30 May 2018 15:11:40 -0400 Received: from mail-ua0-f201.google.com ([209.85.217.201]:53394 "EHLO mail-ua0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753627AbeE3TLi (ORCPT ); Wed, 30 May 2018 15:11:38 -0400 Received: by mail-ua0-f201.google.com with SMTP id n13-v6so3770140ual.20 for ; Wed, 30 May 2018 12:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=9aQWvRpZxmz+xUThk1VS056nmqmtadap/Amm90IoowY=; b=J30A8w7QbttsSNI04uLUmFpoHV1A9Q0KwN5Z41iYoPU1H1AEG56PaMDeU6hOgXwh+F 3UcWprpeW5EFac5nilBRmQbCa6H+uZv/zxBggUAUR2b3gElFHQW/y3VlfDQm6EXRS1yh Z5kU1E1fFwXfYwfk4DiSjbIi/6eUFZQNNrvoOMT5lnVF8YAXzxxcFkIwA6WH/Zh/Ttqk V8mByeKIP8baFnvwIDNnn6j8A6Lrxann79bHu9zDLXHRR7uQ4NA9EVza8NBMFbt1Zcx5 16J4lPqBy2vt50+5oDG+sFWZnm4lG9ywOJNSQyslCfLumg0XS4F2vi8nIAZ9bRLZbQ3z Tfdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=9aQWvRpZxmz+xUThk1VS056nmqmtadap/Amm90IoowY=; b=rrtf87FhYoueVgzsh9uu+lvKVqnoAU+9zrDYkjzUE9PcH4Ic3ePDhUwUsAWfmwSap+ NaTMthcWKfwUYVAL5kyVWybSjymmO4ycYcVVsjHrvZhrX0TL7O17MnCpy2xsIP1xNEup KNIjmFH4vaRtsAISo+wB5CK/Gg1VZcHtrC1bgJfVI3i0n5j4+tW/qSK0hJF9eV6BEA5p Y2VLi1vb29AILNSpksokgcO7JgHVhA1LuTxOFlEnKAfOHEl+uiL8ZGrDDkUC+P2i4xeu OapR3Rz5sbkmauHBQjceKZKglHlvZlP2JgnzVoezGdF036J1y9OcCcas3ZgqpOfQPXck lrbw== X-Gm-Message-State: ALKqPwc20+KJ1XByZZd6QklhfEQZL5xaE86pZ/nFThq3QAtQmR2vQeOg dGr2JxWoS5/qYw5+1mnLXZKkNLm2ieB0I7w6zgdAE0uIbcTaYXYFwHo4SiSAZ2BnF5BPufbRx4E PCtVA2pyxZJTUlJj/rcfEN33fwbD7SjYRpNYnYX+w7R+CUPGge20og81GILZylm2T X-Google-Smtp-Source: ADUXVKKxIbFDWhFZBMFYNWywXPLvLndSvpJxaidlQQWH6EMRiJaI1nuCRJSRnbll47x0P5aF47DMRPGFN4L9 MIME-Version: 1.0 X-Received: by 2002:a1f:8704:: with SMTP id j4-v6mr1498904vkd.41.1527707497346; Wed, 30 May 2018 12:11:37 -0700 (PDT) Date: Wed, 30 May 2018 12:11:32 -0700 Message-Id: <20180530191132.62598-1-nharold@google.com> X-Mailer: git-send-email 2.17.1.1185.g55be947832-goog Subject: [PATCH] iproute2: fix 'ip xfrm monitor all' command From: Nathan Harold To: netdev@vger.kernel.org Cc: Nathan Harold Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently, calling 'ip xfrm monitor all' will actually invoke the 'all-nsid' command because the soft-match for 'all-nsid' occurs before the precise match for 'all'. This patch rearranges the checks so that the 'all' command, itself an alias for invoking 'ip xfrm monitor' with no argument, can be called consistent with the syntax for other ip commands that accept an 'all'. Signed-off-by: Nathan Harold --- ip/xfrm_monitor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c index 2eabece0..5d086768 100644 --- a/ip/xfrm_monitor.c +++ b/ip/xfrm_monitor.c @@ -359,6 +359,8 @@ int do_xfrm_monitor(int argc, char **argv) if (matches(*argv, "file") == 0) { NEXT_ARG(); file = *argv; + } else if (strcmp(*argv, "all") == 0) { + /* fall out */ } else if (matches(*argv, "all-nsid") == 0) { listen_all_nsid = 1; } else if (matches(*argv, "acquire") == 0) { @@ -381,7 +383,7 @@ int do_xfrm_monitor(int argc, char **argv) groups = 0; } else if (matches(*argv, "help") == 0) { usage(); - } else if (strcmp(*argv, "all")) { + } else { fprintf(stderr, "Argument \"%s\" is unknown, try \"ip xfrm monitor help\".\n", *argv); exit(-1); }