From patchwork Tue Aug 1 07:00:13 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: 109106 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp1141023qge; Tue, 1 Aug 2017 00:02:48 -0700 (PDT) X-Received: by 10.200.36.196 with SMTP id t4mr24021355qtt.227.1501570968459; Tue, 01 Aug 2017 00:02:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501570968; cv=none; d=google.com; s=arc-20160816; b=uITftGqfDh5B6v2DBgS2E1/E8NDwh1Xtz6ybF4PGzerGs3p+5yrPBZOAbEh8nTAT1g guGcGldFFC5xWIlsm/CVuEOb/xDSpEPxgGuLV4n4y9V0P5H0sNODADqZxns9bvPopwK5 DrMW9iKOOtzEf82c6eE51TI25oToPB0YW75FeMRTixVNmPWCN6OQSOV3wzAIwCsXyiP7 Sy4qa/mYPCaJ73kH21oR/gaEuK9QdRRVs83+TcjmNw+Aai+f9auSpcSyUIyJqKFFzcpj q26Q6uiGcxUZUTqIA7y2LwyfZeVd92gvQYAxw+4rr7KHPf0CWwoD9wdPn4i3WtjbeMHx GS3A== 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=+0I/8kITTVeIY1WrR1H3DCB8//9Mw/KaWPdDtN4zk1E=; b=AcjTakrdPK5gKAYSQEC7mH9ArrF9/z8AnZJTNQMXpSjjdmevlD6Xovnfd1LhWPrxhd efKzQxkiZZgTwWPOgAyfiGPlUos4aZHcF3/hu6pMudlHxXnIkf5l8yDvw4pMM38/2286 p/N0s1zgWtrN0vRujzaWvBe112uOnA0+yOMgZL9I78zTgiaMmM2eFrW89T7Dhg2DDAtL t91dN/RIKbCORmPIstc5T7dXm/+0VILE0xmF/pATAC0nFextGVBMopnXgn4QHgTPJxjt zrAYw62adw+N18//P9j/AuBRrcYzOdLEUuASPvDNh66oFenJ6LvMOXk8POxEyCPQfiDM 1ZLg== 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 y83si25592146qkb.301.2017.08.01.00.02.48; Tue, 01 Aug 2017 00:02:48 -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 25AEF65D3E; Tue, 1 Aug 2017 07:02:48 +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 87FEC609F2; Tue, 1 Aug 2017 07:01:53 +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 4C39865D29; Tue, 1 Aug 2017 07:01:40 +0000 (UTC) Received: from forward5j.cmail.yandex.net (forward5j.cmail.yandex.net [5.255.227.23]) by lists.linaro.org (Postfix) with ESMTPS id CBA70609F2 for ; Tue, 1 Aug 2017 07:01:02 +0000 (UTC) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [77.88.29.84]) by forward5j.cmail.yandex.net (Yandex) with ESMTP id 6B483206A7 for ; Tue, 1 Aug 2017 10:01:01 +0300 (MSK) Received: from smtp1p.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp1p.mail.yandex.net (Yandex) with ESMTP id 31FA71780F4C for ; Tue, 1 Aug 2017 10:00:33 +0300 (MSK) Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Ca8Lni7XUb-0WYOp2x6; Tue, 01 Aug 2017 10: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 10:00:13 +0300 Message-Id: <1501570817-9260-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501570817-9260-1-git-send-email-odpbot@yandex.ru> References: <1501570817-9260-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 81 Subject: [lng-odp] [PATCH API-NEXT v11 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: 38d17798a2db32c26fbd413245d59dde8e3011d9 **/ 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;