From patchwork Tue Aug 1 03:00:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 109096 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp960317qge; Mon, 31 Jul 2017 20:03:42 -0700 (PDT) X-Received: by 10.200.40.204 with SMTP id j12mr18728776qtj.139.1501556622696; Mon, 31 Jul 2017 20:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501556622; cv=none; d=google.com; s=arc-20160816; b=tibFwXViq306iFi59N/b6+vVDlSsrSdtnM20FgtqHL/jMYJhIWHDQv/5LridVaZhQD I80oQDYrQFallYjPZ6wkhgOIuUtKLlqoVctl8msxgs2hvzDMS3xj8r+LYfwnb6GKx29x M97GMJNVi6NOZ4uWaaHVHDB0GSyXBOahhVifFwKkK901NuuL6Ogl+30V6TemcIvr34X1 6f7YIn1ChnpNny6PQGJks0Hp5gUCCMAMLU0X3mvxFfv+AXt9VsN+OZcrjMk0cOYikKjE 2iAjFzElb/deji7SFFHMkw5Bxe3OsdsaTjf0VdEBcUC8GcbD4ZjnjghdmihuN6Kpsq/l JzpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=VMbHrAhW5MB89AiNHKqXeAD2134r2FFvVVuMxD1zoTU=; b=XY4RNKzXCO9ms95pMFNxTCUyLZznrxSCTSWWjdklmUsiSd1vK2RTgvFaZTiptj+prs 9ZCp+fIjqObfG87I1xzXT0hNJTHL2QYUFPQFdxlv6z5QY7M9tsC8pek8nOsYDyXuzVjh p4TC2bt+NKd2v9z9KDnt+DHv3vEMUOiu5z+vJnmwmxi/UKmPKUu00UHKxVUDJGpDpPmt HWMiXsBUP4t8xZZZ4nc761U5vrIAqB0ANGC3NHi3BWxwEjNwVa76QIPFzxnELwPsbujs C+NKwPOjuFk5/KRAkEcWCefELHmmlLHQX2npo4o0JdO6PzhxWVlW2JKa1jyKSY6W/Abe BbDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id l30si6453490qtd.379.2017.07.31.20.03.42; Mon, 31 Jul 2017 20:03:42 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 4C2F065D5A; Tue, 1 Aug 2017 03:03:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0D1EA65D1E; Tue, 1 Aug 2017 03:01:32 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0BCCF6448C; Tue, 1 Aug 2017 03:01:17 +0000 (UTC) Received: from forward4o.cmail.yandex.net (forward4o.cmail.yandex.net [37.9.109.248]) by lists.linaro.org (Postfix) with ESMTPS id 3A16E644E3 for ; Tue, 1 Aug 2017 03:00:36 +0000 (UTC) Received: from smtp3m.mail.yandex.net (smtp3m.mail.yandex.net [IPv6:2a02:6b8:0:2519::125]) by forward4o.cmail.yandex.net (Yandex) with ESMTP id 817CB20FFD for ; Tue, 1 Aug 2017 06:00:34 +0300 (MSK) Received: from smtp3m.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp3m.mail.yandex.net (Yandex) with ESMTP id 31D562840ED7 for ; Tue, 1 Aug 2017 06:00:33 +0300 (MSK) Received: by smtp3m.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fhHHAuvzj7-0X6iWhkc; Tue, 01 Aug 2017 06:00:33 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 1 Aug 2017 06:00:17 +0300 Message-Id: <1501556421-14133-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501556421-14133-1-git-send-email-odpbot@yandex.ru> References: <1501556421-14133-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 81 Subject: [lng-odp] [PATCH API-NEXT v10 4/8] linux-gen: packet: add support for IP-in-IP (RFC 2003) encap X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Don't barf on IP-in-IP packets parsing, just ignore L4 (=L3) header. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 81 (lumag:ipsec-packet-impl-2) ** https://github.com/Linaro/odp/pull/81 ** Patch: https://github.com/Linaro/odp/pull/81.patch ** Base sha: c16f1363303cd5fc11324acbc4dfebe0a9680a41 ** Merge commit sha: 3b68f39ef3adaf4551e78d31bde736a535ae7ba6 **/ platform/linux-generic/include/protocols/ip.h | 1 + platform/linux-generic/odp_packet.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/platform/linux-generic/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h index 2b34a753..0fc391ab 100644 --- a/platform/linux-generic/include/protocols/ip.h +++ b/platform/linux-generic/include/protocols/ip.h @@ -158,6 +158,7 @@ typedef struct ODP_PACKED { * @{*/ #define _ODP_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */ #define _ODP_IPPROTO_ICMPv4 0x01 /**< Internet Control Message Protocol (1) */ +#define _ODP_IPPROTO_IPIP 0x04 /**< IP Encapsulation within IP (4) */ #define _ODP_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */ #define _ODP_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */ #define _ODP_IPPROTO_ROUTE 0x2B /**< IPv6 Routing header (43) */ diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 1971fdc0..4b8d0856 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2033,6 +2033,10 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, prs->input_flags.icmp = 1; break; + case _ODP_IPPROTO_IPIP: + /* Do nothing */ + break; + case _ODP_IPPROTO_TCP: if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len)) return -1;