From patchwork Fri Jan 12 17:39:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 860092 X-Patchwork-Delegate: shemminger@vyatta.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="Q1b3H1E9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zJ94d1WlBz9t5Y for ; Sat, 13 Jan 2018 04:40:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964967AbeALRkO (ORCPT ); Fri, 12 Jan 2018 12:40:14 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35968 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964885AbeALRkH (ORCPT ); Fri, 12 Jan 2018 12:40:07 -0500 Received: by mail-lf0-f67.google.com with SMTP id e203so6786425lfg.3 for ; Fri, 12 Jan 2018 09:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=jrs3pUX7M/Gz2H2HXrP39IZEEQd0TS1yCVlw89OEI8E=; b=Q1b3H1E9jbNq0AISQJJVJSJkJorWWu40NIQwQwA1EY5eOC2tlw5muH6/h1eCSGpX5e C8oMwpFwc2E9jE4IpPcn3UDoDP1iTTkVlj55/92xqSPrWZOY+UagS/CoA3g45Zar2rp+ fBJEb1kUaFMuekKCm3nvjvh3KMB/ilO9lvm3oDRBTtCczKSTkknUKMfFefWHFuw1HK1A 2Hu++32fjlBfZ7lEcXT1wUEbO/NcYU4ezi2/ofUQtnbZDx8FzMoV4C6nmeq1V82n3237 dt1+kBzMbYDev3EdtQ7mYO4NwJFvKdA7gHnsG43cuW59fT4/TCIp43XgefNk3CFDjwII h+ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=jrs3pUX7M/Gz2H2HXrP39IZEEQd0TS1yCVlw89OEI8E=; b=CsEKHJYCHG0B5LHw0sJN4I7i0zoBGiPcOpH8TZr3Jbw9MR0bxjFaV29s0TmIJHuxaz Pfcl4D/Q9qtj2B1dlE4h+6WZPn64czV9wp99PhH8V0KdEyOOuBIykJspIxUAj4K3vHyQ TSjujat0VOEVNgokSGSHUaSp2RKRpTazvwiZ1J252l8Mk1ZBZY3eikYDRsQDaVBQp98+ 8KG//QUdPmkS7kFvjL4iCI2sPl5No17kYDBIGbwXruzK0bg80aqsNcFAC4+xHDh73hLd BmqiyFZsq+babmX0RYCmC1fk6xumcIPRxcQNwU8kkWR/mqx8IX9XC9AsaNiNycP6+Xmy 1KRw== X-Gm-Message-State: AKwxyteQpVfHfIwOAe3Yw5rNcRYA/z5wLnTvsNYusQ4uT9WT/DdD2LC/ Fffb94Usz95SZ6WNbKCYMBihHw== X-Google-Smtp-Source: ACJfBotk/Z3uKUcSYNFvudSVJSd2hOiWy6sCWH75imh9bAlQ2xGP/zqon4NokaGqPKMcSGFXhRGiQw== X-Received: by 10.25.157.84 with SMTP id g81mr14371898lfe.78.1515778805313; Fri, 12 Jan 2018 09:40:05 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id c190sm3781968lfc.81.2018.01.12.09.40.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 09:40:04 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2 9/9] vti6/tunnel: Unify and simplify link type help functions Date: Fri, 12 Jan 2018 19:39:34 +0200 Message-Id: <1515778774-24173-10-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1515778774-24173-1-git-send-email-serhe.popovych@gmail.com> References: <1515778774-24173-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 these two changes are missing for link_vti6.c: o commit 8b47135474cd (ip: link: Unify link type help functions a bit) o commit 561e650eff67 (ip link: Shortify printing the usage of link type) Replay them on link_vti6.c to bring link type help functions inline with other tunneling code. Signed-off-by: Serhey Popovych --- ip/link_vti6.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/ip/link_vti6.c b/ip/link_vti6.c index a4ad650..b9fe83a 100644 --- a/ip/link_vti6.c +++ b/ip/link_vti6.c @@ -24,20 +24,25 @@ #include "ip_common.h" #include "tunnel.h" +static void print_usage(FILE *f) +{ + fprintf(f, + "Usage: ... vti6 [ remote ADDR ]\n" + " [ local ADDR ]\n" + " [ [i|o]key KEY ]\n" + " [ dev PHYS_DEV ]\n" + " [ fwmark MARK ]\n" + "\n" + "Where: ADDR := { IPV6_ADDRESS }\n" + " KEY := { DOTTED_QUAD | NUMBER }\n" + " MARK := { 0x0..0xffffffff }\n" + ); +} static void usage(void) __attribute__((noreturn)); static void usage(void) { - fprintf(stderr, "Usage: ip link { add | set | change | replace | del } NAME\n"); - fprintf(stderr, " type { vti6 } [ remote ADDR ] [ local ADDR ]\n"); - fprintf(stderr, " [ [i|o]key KEY ]\n"); - fprintf(stderr, " [ dev PHYS_DEV ]\n"); - fprintf(stderr, " [ fwmark MARK ]\n"); - fprintf(stderr, "\n"); - fprintf(stderr, "Where: NAME := STRING\n"); - fprintf(stderr, " ADDR := { IPV6_ADDRESS }\n"); - fprintf(stderr, " KEY := { DOTTED_QUAD | NUMBER }\n"); - fprintf(stderr, " MARK := { 0x0..0xffffffff }\n"); + print_usage(stderr); exit(-1); } @@ -216,9 +221,16 @@ static void vti6_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) print_0xhex(PRINT_ANY, "fwmark", "fwmark 0x%x ", fwmark); } +static void vti6_print_help(struct link_util *lu, int argc, char **argv, + FILE *f) +{ + print_usage(f); +} + struct link_util vti6_link_util = { .id = "vti6", .maxattr = IFLA_VTI_MAX, .parse_opt = vti6_parse_opt, .print_opt = vti6_print_opt, + .print_help = vti6_print_help, };