From patchwork Tue Aug 1 02:00:28 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: 109087 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp926100qge; Mon, 31 Jul 2017 19:18:17 -0700 (PDT) X-Received: by 10.55.161.23 with SMTP id k23mr22221224qke.345.1501553897513; Mon, 31 Jul 2017 19:18:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501553897; cv=none; d=google.com; s=arc-20160816; b=LLt1I9c4mRmMWNkh/Fn+Dbx8vmGDgIXPQoi/sLSi14dQPWretgzZk1PKnfxMq74wB1 fZrwftkc/0zOQ5WCWwDcUzsobehdHWNEKEHfE4TniCg964fw51eVvBFwBYXwJaYBRjEq wtLbqrX+AArKn/jEKXGSBcr2faZJ3tXC/Wx5Gbq8EtMjDSlpF+nPRRvE5nmOVPq8esmu 2sPMeHSpiCiehGxNllJ6iVUGr7jWuH+v+BYuFRIkHFrG5I+DHfslj1DR46PvdJLFs+fC bcINNwJkoH7P6nZTmoxfCtkFNDY1VKHSbEe/L5L2syiY1bt4D9qeVr9ERrwBb/W9n1ls UcCg== 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=avkjeslwVhhZISb4Fz1vyNcoUBuwZnkc2kaX5FFqyPQ=; b=CXyYkGQrcMwk4NqG6vTmEI5MgBuFZQ19ycP89j5IMsl6Z4rg17Gk66Ir/9kjJeOYsH b2U0H3PqBkXjHpJ6u39OlxFFcEj2POQBZhGsT3hKzm69lVl8MedmjVB483AYVQOgXX8y PvznCRXW7Z0YgCTDWZxhszQfWzlHJgwsw3/UXJeqUin9IHMq8kjI6vGFCh+bGKMhQ9Ll +GVaHrifeIkZG8BepLoHq+HR5wOY1/LJi4315A8kVSXvfPwY42fPXwjsFplMFOb2bW4D EEJASgS0TEJJEDEk1WwZSOQ4xND/CnGxHUuPNPhrC/wt9tA47S7na1icB9+rBc/LnBsY rLDw== 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 w89si6539395qte.169.2017.07.31.19.18.17; Mon, 31 Jul 2017 19:18:17 -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 31DC265CF1; Tue, 1 Aug 2017 02:18:17 +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 B202565D26; Tue, 1 Aug 2017 02:02:39 +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 569DF65D24; Tue, 1 Aug 2017 02:02:32 +0000 (UTC) Received: from forward5j.cmail.yandex.net (forward5j.cmail.yandex.net [5.255.227.23]) by lists.linaro.org (Postfix) with ESMTPS id ABFA660C3E for ; Tue, 1 Aug 2017 02:00:48 +0000 (UTC) Received: from smtp2j.mail.yandex.net (smtp2j.mail.yandex.net [IPv6:2a02:6b8:0:801::ac]) by forward5j.cmail.yandex.net (Yandex) with ESMTP id 39C2020C78 for ; Tue, 1 Aug 2017 05:00:47 +0300 (MSK) Received: from smtp2j.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp2j.mail.yandex.net (Yandex) with ESMTP id 15AA13EC1113 for ; Tue, 1 Aug 2017 05:00:46 +0300 (MSK) Received: by smtp2j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Sh0f55Eznu-0jbS8hGN; Tue, 01 Aug 2017 05:00:46 +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 05:00:28 +0300 Message-Id: <1501552832-15888-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501552832-15888-1-git-send-email-odpbot@yandex.ru> References: <1501552832-15888-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 81 Subject: [lng-odp] [PATCH API-NEXT v9 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: 85fc2735116c657c5c5d5f78e419e0323a473a09 **/ 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;