From patchwork Sun Apr 23 12:53:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Vadai X-Patchwork-Id: 753916 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w9qFW3wRZz9ryk for ; Sun, 23 Apr 2017 22:55:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1045461AbdDWMzH (ORCPT ); Sun, 23 Apr 2017 08:55:07 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:33092 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1045427AbdDWMyw (ORCPT ); Sun, 23 Apr 2017 08:54:52 -0400 Received: by mail-wr0-f196.google.com with SMTP id w50so12968923wrc.0 for ; Sun, 23 Apr 2017 05:54:51 -0700 (PDT) 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=Ipheu3SO7RBCeHxH69EcjjT1hkX6p6Pc7Y47V75wYhY=; b=hypPiP8mF9eh+qUk9ieqAMg4e9GbecNWPEB1rcqZ0Ku1JDtM6v+o5N9cQbLo7DcugW qnzc1iOL0YIVkZGt0hT8f5QkEc/3WKgIAAKgxPj0Hnq8jVicHy7Tohfx9rlaMkBqn/QH ThWvDdODqFAwrJQLqjuqMmkjyXP40rUYqGNKPdg7M39QLlECDjOsbZOC4YECvssN2wPz YZjzQ/qqlm6GtzEEP3rlDIFWRsLs4nEUm+bx9SoXQhfAJb1XXxCH4WzSDvrAwXMyG5v3 6Qjhg8toarjcUzi76as2a0BKE5Aw5fsNDPwVgvrmoioTDZxUnAif1mWW4S5SpCCiBFhh v/ow== X-Gm-Message-State: AN3rC/5Uus2ljbKQJN3K/8MWAe4ayw93DUg4NPEZ7iwJN9jDxgVewatZ BrwIvYibJSI1JA== X-Received: by 10.223.177.155 with SMTP id q27mr1833838wra.23.1492952090838; Sun, 23 Apr 2017 05:54:50 -0700 (PDT) Received: from office.vadai.me ([192.116.94.213]) by smtp.gmail.com with ESMTPSA id t16sm9339522wme.16.2017.04.23.05.54.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 05:54:49 -0700 (PDT) From: Amir Vadai To: Stephen Hemminger Cc: netdev@vger.kernel.org, Or Gerlitz , Jamal Hadi Salim , Amir Vadai Subject: [PATCH iproute2 net 8/8] tc/pedit: p_udp: introduce pedit udp support Date: Sun, 23 Apr 2017 15:53:56 +0300 Message-Id: <20170423125356.1298-9-amir@vadai.me> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170423125356.1298-1-amir@vadai.me> References: <20170423125356.1298-1-amir@vadai.me> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Or Gerlitz For example, forward udp traffic destined to port 999 to veth0 and set tcp port to 888: $ tc filter add dev enp0s9 protocol ip parent ffff: \ flower \ ip_proto udp \ dst_port 999 \ action pedit ex munge \ udp dport set 888 \ action mirred egress \ redirect dev veth0 Signed-off-by: Or Gerlitz Signed-off-by: Amir Vadai --- man/man8/tc-pedit.8 | 18 ++++++++++++++++++ tc/p_udp.c | 27 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/man/man8/tc-pedit.8 b/man/man8/tc-pedit.8 index ad1929592660..7f482eafc6c7 100644 --- a/man/man8/tc-pedit.8 +++ b/man/man8/tc-pedit.8 @@ -34,6 +34,8 @@ pedit - generic packet editor action .BI ip " EX_IPHDR_FIELD" | .BI tcp " TCPHDR_FIELD" +| +.BI udp " UDPHDR_FIELD" .RI } " CMD_SPEC" .ti -8 @@ -58,6 +60,10 @@ pedit - generic packet editor action .BR sport " | " dport " | " flags " }" .ti -8 +.IR UDPHDR_FIELD " := { " +.BR sport " | " dport " }" + +.ti -8 .IR CMD_SPEC " := {" .BR clear " | " invert " | " set .IR VAL " | " @@ -219,6 +225,18 @@ Source or destination TCP port number, a 16-bit value. .B flags .RE .TP +.BI udp " UDPHDR_FIELD" +The supported keywords for +.I UDPHDR_FIELD +are: +.RS +.TP +.B sport +.TQ +.B dport +Source or destination TCP port number, a 16-bit value. +.RE +.TP .B clear Clear the addressed data (i.e., set it to zero). .TP diff --git a/tc/p_udp.c b/tc/p_udp.c index 3a86ba382391..a56a1b519254 100644 --- a/tc/p_udp.c +++ b/tc/p_udp.c @@ -28,6 +28,33 @@ parse_udp(int *argc_p, char ***argv_p, struct m_pedit_sel *sel, struct m_pedit_key *tkey) { int res = -1; + int argc = *argc_p; + char **argv = *argv_p; + + if (argc < 2) + return -1; + + tkey->htype = TCA_PEDIT_KEY_EX_HDR_TYPE_UDP; + + if (strcmp(*argv, "sport") == 0) { + NEXT_ARG(); + tkey->off = 0; + res = parse_cmd(&argc, &argv, 2, TU32, RU16, sel, tkey); + goto done; + } + + if (strcmp(*argv, "dport") == 0) { + NEXT_ARG(); + tkey->off = 2; + res = parse_cmd(&argc, &argv, 2, TU32, RU16, sel, tkey); + goto done; + } + + return -1; + +done: + *argc_p = argc; + *argv_p = argv; return res; }