From patchwork Mon Jul 31 12:00:23 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: 109000 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp3565937obm; Mon, 31 Jul 2017 05:05:06 -0700 (PDT) X-Received: by 10.55.22.100 with SMTP id g97mr21404812qkh.228.1501502706905; Mon, 31 Jul 2017 05:05:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501502706; cv=none; d=google.com; s=arc-20160816; b=qTesZtTYd0QCEliODgnCUqHy8Ov7LH0MOTRTcUOglCQBfxjYD7Mi6Ro+ShdGvziu2c MWP1FOlXHtKkZUcSl49ZcQwvJXJSg3NHKNVYGmpQTEJpSChvT68GcWUeckXveZ463gsk 2XQ/s5uHwXb1IYIrh/L2zsiJNHbCEgFGXSoxrAYeFadJTIGEbHPOHL73YW1zSKhGwFiu oThvvg3gkosbvAtaI3bAU0lC/Nzn7BYq/vJn/MNqSTpEAAtTehe7GUgnDjDcukhXO85Z cKbavkO4mWT1F4Aru2VfUZRGqEBJBNrKAcA0M5Wa/wg8VydEEvQukPq6VBbmL2XBMvfr YvhA== 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=tZM+psUZ0vgnyWfCL7dVTkMH2C3deBWoJaVgW4E/eFs=; b=huKjzlPJqNlGtpceVRC5P83Tr9ELrYhJCu8M1uLc/cVHWx7MQiOeHLKECUDEkNmrzG 3AWLSFtyaXNn28UbzIDKPwc9alaYXTKXpX/DYia4APlHS09iKnvvH/YrkQRw3tg4aSwr hSPGHYa3bjwzSNpRQA89LB75QTJfk4Kg+AzXi4+T3ZrKJqzXNOeRdJLQKglv7zzCRRh9 JQdYs2GKpA4Qx0/4i8KsOo7mBcpE8BdMJTn57uopXRHORXYDSMGE+G/cOZ7+2ACrr1p2 Hf03dA7Q6RKB8c2EYVD7/IuVwnz6qZyekSftI+LlfQLyFQImWdUu1kQ0sNjHe/S5Xstl pFfw== 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 s13si9991068qti.301.2017.07.31.05.05.06; Mon, 31 Jul 2017 05:05:06 -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 60288608C4; Mon, 31 Jul 2017 12:05:06 +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 446A664498; Mon, 31 Jul 2017 12:01:55 +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 C8EAA64494; Mon, 31 Jul 2017 12:01:38 +0000 (UTC) Received: from forward2h.cmail.yandex.net (forward2h.cmail.yandex.net [87.250.230.17]) by lists.linaro.org (Postfix) with ESMTPS id 920D4608CE for ; Mon, 31 Jul 2017 12:00:51 +0000 (UTC) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [77.88.29.85]) by forward2h.cmail.yandex.net (Yandex) with ESMTP id 3A92320BE7 for ; Mon, 31 Jul 2017 15:00:50 +0300 (MSK) Received: from smtp2p.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp2p.mail.yandex.net (Yandex) with ESMTP id 77BFB1A800FA for ; Mon, 31 Jul 2017 15:00:46 +0300 (MSK) Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id lFGCprsgrc-0jOWN9kU; Mon, 31 Jul 2017 15:00:45 +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: Mon, 31 Jul 2017 15:00:23 +0300 Message-Id: <1501502427-31731-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501502427-31731-1-git-send-email-odpbot@yandex.ru> References: <1501502427-31731-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 81 Subject: [lng-odp] [PATCH API-NEXT v7 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: ba0b39db1fc90b24a3db1e85e00c2c485b235a47 **/ 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 092af84b..526d398f 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2080,6 +2080,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;