mbuf: add a copy routine

[dpdk.git] / app / test / test_acl.c

diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 28955f0..9cd9e37 100644 (file)
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <string.h>
@@ -544,15 +515,15 @@ test_build_ports_range(void)
        static struct ipv4_7tuple test_data[] = {
                {
                        .proto = 6,
-                       .ip_src = IPv4(10, 1, 1, 1),
-                       .ip_dst = IPv4(192, 168, 0, 33),
+                       .ip_src = RTE_IPV4(10, 1, 1, 1),
+                       .ip_dst = RTE_IPV4(192, 168, 0, 33),
                        .port_dst = 53,
                        .allow = 1,
                },
                {
                        .proto = 6,
-                       .ip_src = IPv4(127, 84, 33, 1),
-                       .ip_dst = IPv4(1, 2, 3, 4),
+                       .ip_src = RTE_IPV4(127, 84, 33, 1),
+                       .ip_dst = RTE_IPV4(1, 2, 3, 4),
                        .port_dst = 65281,
                        .allow = 1,
                },
@@ -1357,19 +1328,6 @@ test_invalid_rules(void)
                goto err;
        }
 
-       rule.dst_mask_len = 0;
-       rule.src_mask_len = 0;
-       rule.data.userdata = 0;
-
-       /* try adding this rule (it should fail because userdata is invalid) */
-       ret = rte_acl_ipv4vlan_add_rules(acx, &rule, 1);
-       if (ret == 0) {
-               printf("Line %i: Adding a rule with invalid user data "
-                               "should have failed!\n", __LINE__);
-               rte_acl_free(acx);
-               return -1;
-       }
-
        rte_acl_free(acx);
 
        return 0;
@@ -1515,26 +1473,6 @@ test_invalid_parameters(void)
        /* free ACL context */
        rte_acl_free(acx);
 
-       /* set wrong rule_size so that adding any rules would fail */
-       param.rule_size = RTE_ACL_IPV4VLAN_RULE_SZ + 4;
-       acx = rte_acl_create(&param);
-       if (acx == NULL) {
-               printf("Line %i: ACL context creation failed!\n", __LINE__);
-               return -1;
-       }
-
-       /* try adding a rule with size different from context rule_size */
-       result = rte_acl_ipv4vlan_add_rules(acx, &rule, 1);
-       if (result == 0) {
-               printf("Line %i: Adding an invalid sized rule "
-                               "should have failed!\n", __LINE__);
-               rte_acl_free(acx);
-               return -1;
-       }
-
-       /* free ACL context */
-       rte_acl_free(acx);
-
 
        /**
         * rte_acl_ipv4vlan_build