From patchwork Thu Sep 7 11:00:21 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: 111881 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp649800qge; Thu, 7 Sep 2017 04:12:26 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDByvA3/j0NP6c0X7DpdUwMWike8xvMgE007NJFohqT6LlV3RXmstoh1gNVpf+RM0hXfI+E X-Received: by 10.55.108.193 with SMTP id h184mr3238345qkc.48.1504782746552; Thu, 07 Sep 2017 04:12:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504782746; cv=none; d=google.com; s=arc-20160816; b=TRL96WioahCw7dcDLxrqrj/mAj7E0ZMkKEJ3749VL/J3AEwXzrfaCqzopn2s27/njH yo6uQLRMyrkJOyAbwuUTXT25GAVaQ9ey64iclCwmCNCOLu6KSFfKKvVi6Lrh3xC7uj5l 0Cg1OPgSKPISzUDPpKjo9rxQq0FAAUBEKnn9PU8F3tW8duFVZio3RaIqkzEGmTazlZM5 XA+hq9aPmc7JfnzTFQVut8OXmI91AArL0mpD40ne07ZoNM0cZR+Jy+VUjV+3HdcEspt2 G3q80odklawbD2HUkUNxTJWSkv6ElgBBfyZgOtlMifYn2ZnPTnaRi5jp++h5Ua08I0Iy rcSQ== 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=SE5YJsaWBClom+wp1sFPHGYE9z2DJxcGGCogu1ECbxs=; b=KEKh4sUAcp6iTOxm9XevfQ+tpHmO0EFReRxP60a0YYBChh3M3xrmKmBF9MtGyocVtt qekYKe56F4n2Gm4F746jeE8x/OaRjkQ4g+uXjMz6PosCaee8GOaRYAXHSmeoBChEaiH7 5lngRfuOeq5MDwHr93HbsGsqPYmNVwPu6IF/LIGDqufp67NZST4uyqCaeA3ATvAoLGr8 tH8ynKpwlCsoi8g79Oce8javO22r0BRziQBQVQAGuvfG5XTybvntb4Fn580+JbKlCDnP /icPiZMgWNXYqilISAcY3p8QfhjJKaATsNwNbw1zQ9mGFaiEzHKGeAcwESlQdzeZCJif 0BNA== 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 i51si2796373qte.371.2017.09.07.04.12.26; Thu, 07 Sep 2017 04:12:26 -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 33BC6644DA; Thu, 7 Sep 2017 11:12:26 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 AF88E644CD; Thu, 7 Sep 2017 11:02:27 +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 AC24564479; Thu, 7 Sep 2017 11:01:49 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 13C56644AF for ; Thu, 7 Sep 2017 11:00:52 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 58DAF2C85A13 for ; Thu, 7 Sep 2017 14:00:50 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id cx51g1aNLR-0oLWk6NB; Thu, 07 Sep 2017 14:00:50 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id r5PzEbFEu0-0nd4ZIdJ; Thu, 07 Sep 2017 14:00:50 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 7 Sep 2017 14:00:21 +0300 Message-Id: <1504782024-26631-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504782024-26631-1-git-send-email-odpbot@yandex.ru> References: <1504782024-26631-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 81 Subject: [lng-odp] [PATCH API-NEXT v16 6/9] 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: 7fa8e2c97ed18f8dd6e95cbc78b7e668ccb98869 ** Merge commit sha: d0f4ea10655492b00c1a40e85a0ba837f06f97c5 **/ 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 1d09fe80..2b2db752 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2385,6 +2385,10 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, 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;