From patchwork Fri Jan 19 16:44:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 863641 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="AClxo/5h"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zNRWD4mKXz9s7F for ; Sat, 20 Jan 2018 03:44:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932166AbeASQoh (ORCPT ); Fri, 19 Jan 2018 11:44:37 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:39004 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756217AbeASQoO (ORCPT ); Fri, 19 Jan 2018 11:44:14 -0500 Received: by mail-lf0-f67.google.com with SMTP id m8so2818515lfc.6 for ; Fri, 19 Jan 2018 08:44:13 -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=2TBOg7FMZ+VTuSXWewf9UOkeczA7MJfwvLz6bHSG0G4=; b=AClxo/5hIs9O4neqQrFcaXM0IcdoG8FwitN78bRfkvFH2gErjttC1AIBaWvLnMMw8V xsIt7N3jxPoD/TRhgUpsE5RiajtbFhDwwMxAPnueWm6lscRLjQJrqeGz9sSB1oewJrNE CcFRbQP7VelH7jX3oD2dxvbiHm97eVEKNzLBLaZ3csHLb525K5dnXNmHFzG3bAMABBNd 72nqygOptw52+DUMRnfiddmaV/FM4m6TZt+tQh0boQD7ENzrQM4tLbFk9knyACc0HxZ3 Za/98rrU2lX9VQ2nLqfe7CPqkh8yV7tnzBBGEfqHIcGb3o/B1oW270f3JZLvo6+EJShg TtrQ== 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=2TBOg7FMZ+VTuSXWewf9UOkeczA7MJfwvLz6bHSG0G4=; b=fiNEd5HD88gtMp1YcwMuSafeKMsifOP2dPE74huygRdSG1oO5VTHO/WqJam5timve4 J4AeAxx5Ag3KRajPhHQu4E/R1f/BiO0mDkfKgN4C4awP0ma/XsDdFklg5CvbuTkgx0Uy 1Xu3V1hE1dZpar4CuGthXM7Lxmo9ZOsuWc6nSEYELC0hz70Mf1CFZWQQmT7p2usiAg27 XHuGhBr+n13CA3L2hd1a9igBKEdIyicStdbeOHsjXiqEK2lPUdPOidKrCeY2ZF+vkm1b 3RWufw00PiY7eDXd5tLGI3cpzNmnSdjxZo7eiviM8XmnwUxinLT+HhSuStnxMqnqYhyp ymBw== X-Gm-Message-State: AKwxytdidi+ItojjHuLWftQE5+4lUSyBkuz7yDc9BAvY3+tBxu/87RkA iUuCmuQARky27Ezliv+r2G7ijQ== X-Google-Smtp-Source: ACJfBosZNMQe3Xqr1sUSZV+VBfKAqNp2Da5xrpaKLmx6tVoyd+tVvsWv8eCINM+CkjJl6I8IxPLVsg== X-Received: by 10.46.112.6 with SMTP id l6mr9855366ljc.32.1516380252693; Fri, 19 Jan 2018 08:44:12 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id 77sm1785587ljx.58.2018.01.19.08.44.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jan 2018 08:44:11 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2 3/4] vti/vti6: Minor improvements Date: Fri, 19 Jan 2018 18:44:02 +0200 Message-Id: <1516380243-32568-4-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1516380243-32568-1-git-send-email-serhe.popovych@gmail.com> References: <1516380243-32568-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 In prepare of link_vti.c and link_vti6.c merge: 1) Make @fwmark of __u32 type instead of unsigned int in vti to match with rest tunneling code. 2) Report when unable to translate @link network device name to index instead of silently exiting in vti6. 3) Remove newline separating local/remote attributes from the ikey/okey in vti6 to match vti module. Signed-off-by: Serhey Popovych --- ip/link_vti.c | 2 +- ip/link_vti6.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ip/link_vti.c b/ip/link_vti.c index 1439e53..6a088c6 100644 --- a/ip/link_vti.c +++ b/ip/link_vti.c @@ -69,7 +69,7 @@ static int vti_parse_opt(struct link_util *lu, int argc, char **argv, unsigned int saddr = 0; unsigned int daddr = 0; unsigned int link = 0; - unsigned int fwmark = 0; + __u32 fwmark = 0; int len; if (!(n->nlmsg_flags & NLM_F_CREATE)) { diff --git a/ip/link_vti6.c b/ip/link_vti6.c index 2a86d59..a11f389 100644 --- a/ip/link_vti6.c +++ b/ip/link_vti6.c @@ -144,8 +144,11 @@ get_failed: } else if (!matches(*argv, "dev")) { NEXT_ARG(); link = if_nametoindex(*argv); - if (link == 0) + if (link == 0) { + fprintf(stderr, "Cannot find device \"%s\"\n", + *argv); exit(-1); + } } else if (strcmp(*argv, "fwmark") == 0) { NEXT_ARG(); if (get_u32(&fwmark, *argv, 0)) @@ -157,7 +160,6 @@ get_failed: addattr32(n, 1024, IFLA_VTI_IKEY, ikey); addattr32(n, 1024, IFLA_VTI_OKEY, okey); - addattr_l(n, 1024, IFLA_VTI_LOCAL, &saddr, sizeof(saddr)); addattr_l(n, 1024, IFLA_VTI_REMOTE, &daddr, sizeof(daddr)); addattr32(n, 1024, IFLA_VTI_FWMARK, fwmark);