From patchwork Tue Feb 20 21:37:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 875715 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CEocUIVJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zmDWH6pM1z9sPx for ; Wed, 21 Feb 2018 08:38:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751343AbeBTViO (ORCPT ); Tue, 20 Feb 2018 16:38:14 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:32820 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750934AbeBTVhn (ORCPT ); Tue, 20 Feb 2018 16:37:43 -0500 Received: by mail-lf0-f65.google.com with SMTP id j193so6331628lfe.0 for ; Tue, 20 Feb 2018 13:37:42 -0800 (PST) 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=2lxSUSu/31IDSDL2rdUhrgVPTsCRFTlmm5mLdqOaoX8=; b=CEocUIVJ9GltbnAuw0jEPgzki6UsAGGcQSC6zez5xJUVezICWShssFypurQC1meFYx SHQlaCAVarETQ+hE/lR4ID+HjjJkNUkh9qdm0jvOpLQwx5OXAl2Evg7McHa6Ki8wULxM c7ANVPHGmwrPDyzlMLAvAt1nvMe9/OjzbZfi9ReSfveqeKpz9fkqiKxgii/h7pKSiVZV nZ/nXiLfQWefXWJ8sfUP3om7Oc/KaSTEbagdZy5No5zBqHgbjPPMPdhHwRjKw1j7aD7v GJjerz6rcbLG6XyRrej8alfuTjaCoaVdcls0ojtFXfnymDMO+42fASVDgM0xP0WGk5xE BLBw== 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=2lxSUSu/31IDSDL2rdUhrgVPTsCRFTlmm5mLdqOaoX8=; b=q2khc7r1w/vKELa6ZxhQ7dYbRCV1pDB1NTd3oPdJ4xUX2g8TNbDLNuL2dQTyLvPON4 RBx5U4yFPFUzVpYZeEUojVjP6U+BWt6PrQQeLIjcMX9bSF4JTqeIkHNCfrY9+4hUj/qG Yfa0l7kAv+ADsfJKIv0sHn3/RTDnnfXLKRk2QbTHmq55I9s081fpinzKmq1IqfrdF6uv T2DRCAOgXfKBb4khOASLIpmt8F7J+BMYOj7EcGNuq31rvVpnib8EC2JoRd+obra1nkVV I32DnO6BwERT8UeSau8h+vkcXDGCZwN39oJWBDZ8HNMVhhjbcRsq0YPeemPAuOBhs9H5 XaIA== X-Gm-Message-State: APf1xPBRbAhAWI0VGCqQh6vzySab7AKXqDIxERKArr2FAFs3sNTtXOZL 7giXzUSA89+EAp1RtXeyPQuHyA== X-Google-Smtp-Source: AH8x224Eawl3mWqP+rJ4Vc89Db+3jymErfvW28GEAYZf/vSw9Rc9FwmXkkp/6LlAicF8kEliRVvhoA== X-Received: by 10.46.127.11 with SMTP id a11mr732234ljd.148.1519162661291; Tue, 20 Feb 2018 13:37:41 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id t69sm3485486ljb.36.2018.02.20.13.37.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Feb 2018 13:37:40 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Cc: dsahern@gmail.com Subject: [PATCH iproute2-next v2 3/7] iplink: Use "dev" and "name" parameters interchangeable when possible Date: Tue, 20 Feb 2018 23:37:25 +0200 Message-Id: <1519162649-22449-4-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1519162649-22449-1-git-send-email-serhe.popovych@gmail.com> References: <1519162649-22449-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Both of them accept network device name as argument, but have different meaning: dev - is a device by it's name, name - name for specific device device. The only case where they treated separately is network device rename case where need to specify both ifindex and new name. In rest of the cases we can assume that dev == name. With this change we do following: 1) Kill ambiguity with both "dev" and "name" parameters given the same name: ip link {add|set} dev veth100a name veth100a ... 2) Make sure we do not accept "name" more than once. 3) For VF and XDP treat "name" as "dev". Fail in case of "dev" is given after VF and/or XDP parsing. 4) Make veth and vxcan to accept both "name" and "dev" as their peer parameters, effectively following general ip-link(8) utility behaviour on link create: ip link add {name|dev} veth1a type veth peer {name|dev} veth1b Signed-off-by: Serhey Popovych --- ip/iplink.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/ip/iplink.c b/ip/iplink.c index fc358fc..1359c0f 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -605,9 +605,15 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, req->i.ifi_flags &= ~IFF_UP; } else if (strcmp(*argv, "name") == 0) { NEXT_ARG(); + if (*name) + duparg("name", *argv); if (check_ifname(*argv)) invarg("\"name\" not a valid ifname", *argv); *name = *argv; + if (!*dev) { + *dev = *name; + dev_index = ll_name_to_index(*dev); + } } else if (strcmp(*argv, "index") == 0) { NEXT_ARG(); if (*index) @@ -665,6 +671,9 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, if (xdp_parse(&argc, &argv, req, dev_index, generic, drv, offload)) exit(-1); + + if (offload && *name == *dev) + *dev = NULL; } else if (strcmp(*argv, "netns") == 0) { NEXT_ARG(); if (netns != -1) @@ -755,6 +764,9 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, if (len < 0) return -1; addattr_nest_end(&req->n, vflist); + + if (*name == *dev) + *dev = NULL; } else if (matches(*argv, "master") == 0) { int ifindex; @@ -905,7 +917,7 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, if (strcmp(*argv, "dev") == 0) NEXT_ARG(); - if (*dev) + if (*dev != *name) duparg2("dev", *argv); if (check_ifname(*argv)) invarg("\"dev\" not a valid ifname", *argv); @@ -915,6 +927,14 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, argc--; argv++; } + /* Allow "ip link add dev" and "ip link add name" */ + if (!*name) + *name = *dev; + else if (!*dev) + *dev = *name; + else if (!strcmp(*name, *dev)) + *name = *dev; + if (dev_index && addr_len) { int halen = nl_get_ll_addr_len(dev_index); @@ -993,10 +1013,16 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv) req.i.ifi_index = ll_name_to_index(dev); if (!req.i.ifi_index) return nodev(dev); + + /* Not renaming to the same name */ + if (name == dev) + name = NULL; } else { - /* Allow "ip link add dev" and "ip link add name" */ - if (!name) - name = dev; + if (name != dev) { + fprintf(stderr, + "both \"name\" and \"dev\" cannot be used when creating devices.\n"); + exit(-1); + } if (link) { int ifindex;