From patchwork Wed Feb 7 11:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 127153 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp361443ljc; Wed, 7 Feb 2018 03:09:36 -0800 (PST) X-Google-Smtp-Source: AH8x224iqOZDU2aGDkipWyv+ply8kb2gLlmChbeXnSTumConITxABsKdAKoYAIJhkrEBISESrbja X-Received: by 10.233.216.131 with SMTP id u125mr8817512qkf.293.1518001776596; Wed, 07 Feb 2018 03:09:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518001776; cv=none; d=google.com; s=arc-20160816; b=qaKGtUiJuAt7/4TGX5oTp1xY6Y4B2MRDXYp/S+xFM7eMvrXsMyli1tnpdcCVBZ8yAq OLD1qv+81Z7vblPnv+k/dHxYRxxlEdcSNU2dETpB6O1IqOAmY8RbZ2TUH0L33CKDjG6m RjDNkjx1DPa+ZlRvZ2vJlshwZwXFCHhPZ9TAfU2GE/QU9Mc3AyctG9LKMx08cI5FBe7I pok94N7nVxEZG7EBujwyqO1LrUMLye2ebWoxkuwYA2LmOoEEYAe2E98ELtuA3v3NuXuA UfPnWunz94zifUy5OxpLBtf0ZOtdMxxt8l8yMvHA6dPtxhvyZSpGwbmKHTtgPbUZT0hy chGw== 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=lAYWmhI7CvMmLRp+Z+jwgNWUxiathoavJfAZ1W2aII4=; b=0wXQj5uVBYjTjD+S0+0EDMXX4EwblFivI0muAMIWfYnohcfF4pQKuB270PSdTrRIEh a21uL+Za0VlK3vV6Q3FQ6FiGY7iK2OmFnrpT0b3dqkGfsYIgpjaM6cDBZIHlpv77bfq+ aFUunXHNuzMQ4e2Xtm3pnLXzAqGiATpJymhIrCgg/PawOOJd0WswHgGEe0jDEFNaF48o lM+YIGPgSxxtXIJCp+SSfzmPyMsaU/w+OGItJdJvWjYEITlw1YcRMmjAW02YxjFH6Vci G+O9uhhSD8Td+O14mtVRVUn1cb80Ethn/nDnb2FKXhrw1n8iW0xya1KQXBqQiAurluA2 MU4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 74si1325723qkb.129.2018.02.07.03.09.36; Wed, 07 Feb 2018 03:09:36 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 37EE3619C9; Wed, 7 Feb 2018 11:09:36 +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, RCVD_IN_MSPIKE_H2 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 A081F62788; Wed, 7 Feb 2018 11:03:29 +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 4947D61806; Wed, 7 Feb 2018 11:03:17 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id 4402F61809 for ; Wed, 7 Feb 2018 11:01:48 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 2B3D244629 for ; Wed, 7 Feb 2018 14:01:47 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id CAuTQXjI9z-1ljmjBN0; Wed, 07 Feb 2018 14:01:47 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id LVw23zZMqp-1eVKD7BP; Wed, 07 Feb 2018 14:01:40 +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: Wed, 7 Feb 2018 14:00:05 +0300 Message-Id: <1518001208-29529-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518001208-29529-1-git-send-email-odpbot@yandex.ru> References: <1518001208-29529-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 457 Subject: [lng-odp] [PATCH API-NEXT v1 11/14] validation: switch to using odp_packet_l4_type_set() 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 Use odp_packet_l4_type_set() instead of calling odp_packet_has_*_set(). Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 457 (lumag:packet-types) ** https://github.com/Linaro/odp/pull/457 ** Patch: https://github.com/Linaro/odp/pull/457.patch ** Base sha: e1175d5a69c65bb465022c9f1381c40fdb5c4069 ** Merge commit sha: 802ddfc5ea6f47a8935993bf6f8c1675a4c94930 **/ .../api/classification/odp_classification_common.c | 4 +- test/validation/api/packet/packet.c | 68 ++++++++++++++++++++-- test/validation/api/traffic_mngr/traffic_mngr.c | 4 +- 3 files changed, 68 insertions(+), 8 deletions(-) diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c index 191489126..7d6d24162 100644 --- a/test/validation/api/classification/odp_classification_common.c +++ b/test/validation/api/classification/odp_classification_common.c @@ -350,7 +350,7 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) udp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); udp->length = odp_cpu_to_be_16(payload_len + ODPH_UDPHDR_LEN); udp->chksum = 0; - odp_packet_has_udp_set(pkt, 1); + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_UDP); if (odph_udp_tcp_chksum(pkt, ODPH_CHKSUM_GENERATE, NULL) != 0) { LOG_ERR("odph_udp_tcp_chksum failed\n"); return ODP_PACKET_INVALID; @@ -360,7 +360,7 @@ odp_packet_t create_packet(cls_packet_info_t pkt_info) tcp->dst_port = odp_cpu_to_be_16(CLS_DEFAULT_DPORT); tcp->hl = ODPH_TCPHDR_LEN / 4; tcp->cksm = 0; - odp_packet_has_tcp_set(pkt, 1); + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_TCP); if (odph_udp_tcp_chksum(pkt, ODPH_CHKSUM_GENERATE, NULL) != 0) { LOG_ERR("odph_udp_tcp_chksum failed\n"); return ODP_PACKET_INVALID; diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c index 6771100cd..0ba4fe2de 100644 --- a/test/validation/api/packet/packet.c +++ b/test/validation/api/packet/packet.c @@ -1053,25 +1053,85 @@ void packet_test_in_flags(void) TEST_INFLAG(pkt, ipfrag); TEST_INFLAG(pkt, ipopt); TEST_INFLAG(pkt, ipsec); - TEST_INFLAG(pkt, udp); - TEST_INFLAG(pkt, tcp); - TEST_INFLAG(pkt, sctp); - TEST_INFLAG(pkt, icmp); odp_packet_l3_type_set(pkt, ODP_PROTO_L3_TYPE_NONE); CU_ASSERT_EQUAL(odp_packet_l3_type(pkt), ODP_PROTO_L3_TYPE_NONE); CU_ASSERT(!odp_packet_has_ipv4(pkt)); CU_ASSERT(!odp_packet_has_ipv6(pkt)); + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_NONE); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt), ODP_PROTO_L4_TYPE_NONE); + CU_ASSERT(!odp_packet_has_tcp(pkt)); + CU_ASSERT(!odp_packet_has_udp(pkt)); + CU_ASSERT(!odp_packet_has_sctp(pkt)); + CU_ASSERT(!odp_packet_has_icmp(pkt)); + CU_ASSERT(!odp_packet_has_ipsec(pkt)); + odp_packet_l3_type_set(pkt, ODP_PROTO_L3_TYPE_IPV4); CU_ASSERT_EQUAL(odp_packet_l3_type(pkt), ODP_PROTO_L3_TYPE_IPV4); CU_ASSERT(odp_packet_has_ipv4(pkt)); CU_ASSERT(!odp_packet_has_ipv6(pkt)); + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_ICMPV4); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt), ODP_PROTO_L4_TYPE_ICMPV4); + CU_ASSERT(!odp_packet_has_tcp(pkt)); + CU_ASSERT(!odp_packet_has_udp(pkt)); + CU_ASSERT(!odp_packet_has_sctp(pkt)); + CU_ASSERT(odp_packet_has_icmp(pkt)); + CU_ASSERT(!odp_packet_has_ipsec(pkt)); + + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_TCP); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt), ODP_PROTO_L4_TYPE_TCP); + CU_ASSERT(odp_packet_has_tcp(pkt)); + CU_ASSERT(!odp_packet_has_udp(pkt)); + CU_ASSERT(!odp_packet_has_sctp(pkt)); + CU_ASSERT(!odp_packet_has_icmp(pkt)); + CU_ASSERT(!odp_packet_has_ipsec(pkt)); + + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_UDP); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt), ODP_PROTO_L4_TYPE_UDP); + CU_ASSERT(!odp_packet_has_tcp(pkt)); + CU_ASSERT(odp_packet_has_udp(pkt)); + CU_ASSERT(!odp_packet_has_sctp(pkt)); + CU_ASSERT(!odp_packet_has_icmp(pkt)); + CU_ASSERT(!odp_packet_has_ipsec(pkt)); + + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_SCTP); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt), ODP_PROTO_L4_TYPE_SCTP); + CU_ASSERT(!odp_packet_has_tcp(pkt)); + CU_ASSERT(!odp_packet_has_udp(pkt)); + CU_ASSERT(odp_packet_has_sctp(pkt)); + CU_ASSERT(!odp_packet_has_icmp(pkt)); + CU_ASSERT(!odp_packet_has_ipsec(pkt)); + + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_AH); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt), ODP_PROTO_L4_TYPE_AH); + CU_ASSERT(!odp_packet_has_tcp(pkt)); + CU_ASSERT(!odp_packet_has_udp(pkt)); + CU_ASSERT(!odp_packet_has_sctp(pkt)); + CU_ASSERT(!odp_packet_has_icmp(pkt)); + CU_ASSERT(odp_packet_has_ipsec(pkt)); + + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_ESP); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt), ODP_PROTO_L4_TYPE_ESP); + CU_ASSERT(!odp_packet_has_tcp(pkt)); + CU_ASSERT(!odp_packet_has_udp(pkt)); + CU_ASSERT(!odp_packet_has_sctp(pkt)); + CU_ASSERT(!odp_packet_has_icmp(pkt)); + CU_ASSERT(odp_packet_has_ipsec(pkt)); + odp_packet_l3_type_set(pkt, ODP_PROTO_L3_TYPE_IPV6); CU_ASSERT_EQUAL(odp_packet_l3_type(pkt), ODP_PROTO_L3_TYPE_IPV6); CU_ASSERT(!odp_packet_has_ipv4(pkt)); CU_ASSERT(odp_packet_has_ipv6(pkt)); + + odp_packet_l4_type_set(pkt, ODP_PROTO_L4_TYPE_ICMPV6); + CU_ASSERT_EQUAL(odp_packet_l4_type(pkt), ODP_PROTO_L4_TYPE_ICMPV6); + CU_ASSERT(!odp_packet_has_tcp(pkt)); + CU_ASSERT(!odp_packet_has_udp(pkt)); + CU_ASSERT(!odp_packet_has_sctp(pkt)); + CU_ASSERT(odp_packet_has_icmp(pkt)); + CU_ASSERT(!odp_packet_has_ipsec(pkt)); } void packet_test_error_flags(void) diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c index 4b70282b1..c597cffcf 100644 --- a/test/validation/api/traffic_mngr/traffic_mngr.c +++ b/test/validation/api/traffic_mngr/traffic_mngr.c @@ -775,7 +775,7 @@ static odp_packet_t make_pkt(odp_pool_t pkt_pool, if (pkt_info->use_tcp) { /* TCP Header */ - odp_packet_has_tcp_set(odp_pkt, 1); + odp_packet_l4_type_set(odp_pkt, ODP_PROTO_L4_TYPE_TCP); tcp_hdr->src_port = odp_cpu_to_be_16(DEFAULT_TCP_SRC_PORT); tcp_hdr->dst_port = odp_cpu_to_be_16(DEFAULT_TCP_DST_PORT); tcp_hdr->seq_no = odp_cpu_to_be_32(cpu_tcp_seq_num); @@ -790,7 +790,7 @@ static odp_packet_t make_pkt(odp_pool_t pkt_pool, cpu_tcp_seq_num += payload_len; } else { /* UDP Header */ - odp_packet_has_udp_set(odp_pkt, 1); + odp_packet_l4_type_set(odp_pkt, ODP_PROTO_L4_TYPE_UDP); udp_hdr->src_port = odp_cpu_to_be_16(DEFAULT_UDP_SRC_PORT); udp_hdr->dst_port = odp_cpu_to_be_16(DEFAULT_UDP_DST_PORT); udp_hdr->length = odp_cpu_to_be_16(l4_len);