net: add rte prefix to IP defines
[dpdk.git] / app / test / test_acl.h
index 4af457d..b071f47 100644 (file)
-/*-
- *   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
  */
 
 #ifndef TEST_ACL_H_
 #define TEST_ACL_H_
 
 struct ipv4_7tuple {
-       uint16_t vlan;
-       uint16_t domain;
-        uint8_t proto;
-        uint32_t ip_src;
-        uint32_t ip_dst;
-        uint16_t port_src;
-        uint16_t port_dst;
-        uint32_t allow;
-        uint32_t deny;
+       uint16_t vlan;
+       uint16_t domain;
+       uint8_t proto;
+       uint32_t ip_src;
+       uint32_t ip_dst;
+       uint16_t port_src;
+       uint16_t port_dst;
+       uint32_t allow;
+       uint32_t deny;
+};
+
+/**
+ * Legacy support for 7-tuple IPv4 and VLAN rule.
+ * This structure and corresponding API is deprecated.
+ */
+struct rte_acl_ipv4vlan_rule {
+       struct rte_acl_rule_data data; /**< Miscellaneous data for the rule. */
+       uint8_t proto;                 /**< IPv4 protocol ID. */
+       uint8_t proto_mask;            /**< IPv4 protocol ID mask. */
+       uint16_t vlan;                 /**< VLAN ID. */
+       uint16_t vlan_mask;            /**< VLAN ID mask. */
+       uint16_t domain;               /**< VLAN domain. */
+       uint16_t domain_mask;          /**< VLAN domain mask. */
+       uint32_t src_addr;             /**< IPv4 source address. */
+       uint32_t src_mask_len;         /**< IPv4 source address mask. */
+       uint32_t dst_addr;             /**< IPv4 destination address. */
+       uint32_t dst_mask_len;         /**< IPv4 destination address mask. */
+       uint16_t src_port_low;         /**< L4 source port low. */
+       uint16_t src_port_high;        /**< L4 source port high. */
+       uint16_t dst_port_low;         /**< L4 destination port low. */
+       uint16_t dst_port_high;        /**< L4 destination port high. */
+};
+
+/**
+ * Specifies fields layout inside rte_acl_rule for rte_acl_ipv4vlan_rule.
+ */
+enum {
+       RTE_ACL_IPV4VLAN_PROTO_FIELD,
+       RTE_ACL_IPV4VLAN_VLAN1_FIELD,
+       RTE_ACL_IPV4VLAN_VLAN2_FIELD,
+       RTE_ACL_IPV4VLAN_SRC_FIELD,
+       RTE_ACL_IPV4VLAN_DST_FIELD,
+       RTE_ACL_IPV4VLAN_SRCP_FIELD,
+       RTE_ACL_IPV4VLAN_DSTP_FIELD,
+       RTE_ACL_IPV4VLAN_NUM_FIELDS
+};
+
+/**
+ * Macro to define rule size for rte_acl_ipv4vlan_rule.
+ */
+#define        RTE_ACL_IPV4VLAN_RULE_SZ        \
+       RTE_ACL_RULE_SZ(RTE_ACL_IPV4VLAN_NUM_FIELDS)
+
+/*
+ * That effectively defines order of IPV4VLAN classifications:
+ *  - PROTO
+ *  - VLAN (TAG and DOMAIN)
+ *  - SRC IP ADDRESS
+ *  - DST IP ADDRESS
+ *  - PORTS (SRC and DST)
+ */
+enum {
+       RTE_ACL_IPV4VLAN_PROTO,
+       RTE_ACL_IPV4VLAN_VLAN,
+       RTE_ACL_IPV4VLAN_SRC,
+       RTE_ACL_IPV4VLAN_DST,
+       RTE_ACL_IPV4VLAN_PORTS,
+       RTE_ACL_IPV4VLAN_NUM
 };
 
 /* rules for invalid layout test */
 struct rte_acl_ipv4vlan_rule invalid_layout_rules[] = {
                /* test src and dst address */
                {
-                               .data = {.userdata = 1, .category_mask = 1},
-                               .src_addr = IPv4(10,0,0,0),
+                               .data = {.userdata = 1, .category_mask = 1,
+                                       .priority = 1},
+                               .src_addr = RTE_IPv4(10,0,0,0),
                                .src_mask_len = 24,
                },
                {
-                               .data = {.userdata = 2, .category_mask = 1},
-                               .dst_addr = IPv4(10,0,0,0),
+                               .data = {.userdata = 2, .category_mask = 1,
+                                       .priority = 1},
+                               .dst_addr = RTE_IPv4(10,0,0,0),
                                .dst_mask_len = 24,
                },
                /* test src and dst ports */
                {
-                               .data = {.userdata = 3, .category_mask = 1},
+                               .data = {.userdata = 3, .category_mask = 1,
+                                       .priority = 1},
                                .dst_port_low = 100,
                                .dst_port_high = 100,
                },
                {
-                               .data = {.userdata = 4, .category_mask = 1},
+                               .data = {.userdata = 4, .category_mask = 1,
+                                       .priority = 1},
                                .src_port_low = 100,
                                .src_port_high = 100,
                },
                /* test proto */
                {
-                               .data = {.userdata = 5, .category_mask = 1},
+                               .data = {.userdata = 5, .category_mask = 1,
+                                       .priority = 1},
                                .proto = 0xf,
                                .proto_mask = 0xf
                },
                {
-                               .data = {.userdata = 6, .category_mask = 1},
+                               .data = {.userdata = 6, .category_mask = 1,
+                                       .priority = 1},
                                .dst_port_low = 0xf,
                                .dst_port_high = 0xf,
                }
@@ -88,8 +124,8 @@ struct rte_acl_ipv4vlan_rule invalid_layout_rules[] = {
  * results using the wrong data layout.
  */
 struct ipv4_7tuple invalid_layout_data[] = {
-               {.ip_src = IPv4(10,0,1,0)},             /* should not match */
-               {.ip_src = IPv4(10,0,0,1), .allow = 2}, /* should match 2 */
+               {.ip_src = RTE_IPv4(10,0,1,0)},             /* should not match */
+               {.ip_src = RTE_IPv4(10,0,0,1), .allow = 2}, /* should match 2 */
                {.port_src = 100, .allow = 4},          /* should match 4 */
                {.port_dst = 0xf, .allow = 6},          /* should match 6 */
 };
@@ -105,8 +141,8 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets traveling to 192.168.0.0/16 */
                {
                                .data = {.userdata = 1, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 2},
-                               .dst_addr = IPv4(192,168,0,0),
+                                               .priority = 230},
+                               .dst_addr = RTE_IPv4(192,168,0,0),
                                .dst_mask_len = 16,
                                .src_port_low = 0,
                                .src_port_high = 0xffff,
@@ -116,8 +152,8 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets traveling to 192.168.1.0/24 */
                {
                                .data = {.userdata = 2, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 3},
-                               .dst_addr = IPv4(192,168,1,0),
+                                               .priority = 330},
+                               .dst_addr = RTE_IPv4(192,168,1,0),
                                .dst_mask_len = 24,
                                .src_port_low = 0,
                                .src_port_high = 0xffff,
@@ -127,8 +163,8 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets traveling to 192.168.1.50 */
                {
                                .data = {.userdata = 3, .category_mask = ACL_DENY_MASK,
-                                               .priority = 2},
-                               .dst_addr = IPv4(192,168,1,50),
+                                               .priority = 230},
+                               .dst_addr = RTE_IPv4(192,168,1,50),
                                .dst_mask_len = 32,
                                .src_port_low = 0,
                                .src_port_high = 0xffff,
@@ -140,8 +176,8 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets traveling from 10.0.0.0/8 */
                {
                                .data = {.userdata = 4, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 2},
-                               .src_addr = IPv4(10,0,0,0),
+                                               .priority = 240},
+                               .src_addr = RTE_IPv4(10,0,0,0),
                                .src_mask_len = 8,
                                .src_port_low = 0,
                                .src_port_high = 0xffff,
@@ -151,8 +187,8 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets traveling from 10.1.1.0/24 */
                {
                                .data = {.userdata = 5, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 3},
-                               .src_addr = IPv4(10,1,1,0),
+                                               .priority = 340},
+                               .src_addr = RTE_IPv4(10,1,1,0),
                                .src_mask_len = 24,
                                .src_port_low = 0,
                                .src_port_high = 0xffff,
@@ -162,8 +198,8 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets traveling from 10.1.1.1 */
                {
                                .data = {.userdata = 6, .category_mask = ACL_DENY_MASK,
-                                               .priority = 2},
-                               .src_addr = IPv4(10,1,1,1),
+                                               .priority = 240},
+                               .src_addr = RTE_IPv4(10,1,1,1),
                                .src_mask_len = 32,
                                .src_port_low = 0,
                                .src_port_high = 0xffff,
@@ -175,7 +211,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets with lower 7 bytes of VLAN tag equal to 0x64  */
                {
                                .data = {.userdata = 7, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 2},
+                                               .priority = 260},
                                .vlan = 0x64,
                                .vlan_mask = 0x7f,
                                .src_port_low = 0,
@@ -186,7 +222,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets with VLAN tags that have 0x5 in them */
                {
                                .data = {.userdata = 8, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 2},
+                                               .priority = 260},
                                .vlan = 0x5,
                                .vlan_mask = 0x5,
                                .src_port_low = 0,
@@ -197,7 +233,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets with VLAN tag 5 */
                {
                                .data = {.userdata = 9, .category_mask = ACL_DENY_MASK,
-                                               .priority = 3},
+                                               .priority = 360},
                                .vlan = 0x5,
                                .vlan_mask = 0xffff,
                                .src_port_low = 0,
@@ -210,7 +246,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets with lower 7 bytes of domain equal to 0x64  */
                {
                                .data = {.userdata = 10, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 2},
+                                               .priority = 250},
                                .domain = 0x64,
                                .domain_mask = 0x7f,
                                .src_port_low = 0,
@@ -221,7 +257,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets with domains that have 0x5 in them */
                {
                                .data = {.userdata = 11, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 3},
+                                               .priority = 350},
                                .domain = 0x5,
                                .domain_mask = 0x5,
                                .src_port_low = 0,
@@ -232,7 +268,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets with domain 5 */
                {
                                .data = {.userdata = 12, .category_mask = ACL_DENY_MASK,
-                                               .priority = 3},
+                                               .priority = 350},
                                .domain = 0x5,
                                .domain_mask = 0xffff,
                                .src_port_low = 0,
@@ -245,7 +281,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches everything with dst port 80 */
                {
                                .data = {.userdata = 13, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 3},
+                                               .priority = 310},
                                .dst_port_low = 80,
                                .dst_port_high = 80,
                                .src_port_low = 0,
@@ -254,7 +290,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches everything with dst port 22-1023 */
                {
                                .data = {.userdata = 14, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 2},
+                                               .priority = 210},
                                .dst_port_low = 22,
                                .dst_port_high = 1023,
                                .src_port_low = 0,
@@ -263,7 +299,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches everything with dst port 1020 */
                {
                                .data = {.userdata = 15, .category_mask = ACL_DENY_MASK,
-                                               .priority = 3},
+                                               .priority = 310},
                                .dst_port_low = 1020,
                                .dst_port_high = 1020,
                                .src_port_low = 0,
@@ -272,7 +308,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches everything with dst portrange  1000-2000 */
                {
                                .data = {.userdata = 16, .category_mask = ACL_DENY_MASK,
-                                               .priority = 2},
+                                               .priority = 210},
                                .dst_port_low = 1000,
                                .dst_port_high = 2000,
                                .src_port_low = 0,
@@ -283,7 +319,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches everything with src port 80 */
                {
                                .data = {.userdata = 17, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 3},
+                                               .priority = 320},
                                .src_port_low = 80,
                                .src_port_high = 80,
                                .dst_port_low = 0,
@@ -292,7 +328,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches everything with src port 22-1023 */
                {
                                .data = {.userdata = 18, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 2},
+                                               .priority = 220},
                                .src_port_low = 22,
                                .src_port_high = 1023,
                                .dst_port_low = 0,
@@ -301,7 +337,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches everything with src port 1020 */
                {
                                .data = {.userdata = 19, .category_mask = ACL_DENY_MASK,
-                                               .priority = 3},
+                                               .priority = 320},
                                .src_port_low = 1020,
                                .src_port_high = 1020,
                                .dst_port_low = 0,
@@ -310,7 +346,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches everything with src portrange  1000-2000 */
                {
                                .data = {.userdata = 20, .category_mask = ACL_DENY_MASK,
-                                               .priority = 2},
+                                               .priority = 220},
                                .src_port_low = 1000,
                                .src_port_high = 2000,
                                .dst_port_low = 0,
@@ -321,7 +357,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets with protocol number either 0x64 or 0xE4 */
                {
                                .data = {.userdata = 21, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 2},
+                                               .priority = 270},
                                .proto = 0x64,
                                .proto_mask = 0x7f,
                                .src_port_low = 0,
@@ -343,7 +379,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                /* matches all packets with protocol 5 */
                {
                                .data = {.userdata = 23, .category_mask = ACL_DENY_MASK,
-                                               .priority = 3},
+                                               .priority = 370},
                                .proto = 0x5,
                                .proto_mask = 0xff,
                                .src_port_low = 0,
@@ -355,11 +391,11 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 /* rules combining various fields */
                {
                                .data = {.userdata = 24, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 4},
+                                               .priority = 400},
                                /** make sure that unmasked bytes don't fail! */
-                               .dst_addr = IPv4(1,2,3,4),
+                               .dst_addr = RTE_IPv4(1,2,3,4),
                                .dst_mask_len = 16,
-                               .src_addr = IPv4(5,6,7,8),
+                               .src_addr = RTE_IPv4(5,6,7,8),
                                .src_mask_len = 24,
                                .proto = 0x5,
                                .proto_mask = 0xff,
@@ -374,10 +410,10 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                },
                {
                                .data = {.userdata = 25, .category_mask = ACL_DENY_MASK,
-                                               .priority = 4},
-                               .dst_addr = IPv4(5,6,7,8),
+                                               .priority = 400},
+                               .dst_addr = RTE_IPv4(5,6,7,8),
                                .dst_mask_len = 24,
-                               .src_addr = IPv4(1,2,3,4),
+                               .src_addr = RTE_IPv4(1,2,3,4),
                                .src_mask_len = 16,
                                .proto = 0x5,
                                .proto_mask = 0xff,
@@ -392,10 +428,10 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                },
                {
                                .data = {.userdata = 26, .category_mask = ACL_ALLOW_MASK,
-                                               .priority = 5},
-                               .dst_addr = IPv4(1,2,3,4),
+                                               .priority = 500},
+                               .dst_addr = RTE_IPv4(1,2,3,4),
                                .dst_mask_len = 8,
-                               .src_addr = IPv4(5,6,7,8),
+                               .src_addr = RTE_IPv4(5,6,7,8),
                                .src_mask_len = 32,
                                .proto = 0x5,
                                .proto_mask = 0xff,
@@ -408,10 +444,10 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
                },
                {
                                .data = {.userdata = 27, .category_mask = ACL_DENY_MASK,
-                                               .priority = 5},
-                               .dst_addr = IPv4(5,6,7,8),
+                                               .priority = 500},
+                               .dst_addr = RTE_IPv4(5,6,7,8),
                                .dst_mask_len = 32,
-                               .src_addr = IPv4(1,2,3,4),
+                               .src_addr = RTE_IPv4(1,2,3,4),
                                .src_mask_len = 8,
                                .proto = 0x5,
                                .proto_mask = 0xff,
@@ -427,20 +463,20 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 /* data for ACL unit test */
 struct ipv4_7tuple acl_test_data[] = {
 /* testing single rule aspects */
-               {.ip_src = IPv4(10,0,0,0), .allow = 4}, /* should match 4 */
-               {.ip_src = IPv4(10,1,1,2), .allow = 5}, /* should match 5 */
-               {.ip_src = IPv4(10,1,1,1), .allow = 5,
+               {.ip_src = RTE_IPv4(10,0,0,0), .allow = 4}, /* should match 4 */
+               {.ip_src = RTE_IPv4(10,1,1,2), .allow = 5}, /* should match 5 */
+               {.ip_src = RTE_IPv4(10,1,1,1), .allow = 5,
                                .deny = 6},                     /* should match 5, 6 */
-               {.ip_dst = IPv4(10,0,0,0)},             /* should not match */
-               {.ip_dst = IPv4(10,1,1,2)},             /* should not match */
-               {.ip_dst = IPv4(10,1,1,1)},             /* should not match */
+               {.ip_dst = RTE_IPv4(10,0,0,0)},             /* should not match */
+               {.ip_dst = RTE_IPv4(10,1,1,2)},             /* should not match */
+               {.ip_dst = RTE_IPv4(10,1,1,1)},             /* should not match */
 
-               {.ip_src = IPv4(192,168,2,50)},             /* should not match */
-               {.ip_src = IPv4(192,168,1,2)},              /* should not match */
-               {.ip_src = IPv4(192,168,1,50)},             /* should not match */
-               {.ip_dst = IPv4(192,168,2,50), .allow = 1}, /* should match 1 */
-               {.ip_dst = IPv4(192,168,1,49), .allow = 2}, /* should match 2 */
-               {.ip_dst = IPv4(192,168,1,50), .allow = 2,
+               {.ip_src = RTE_IPv4(192,168,2,50)},             /* should not match */
+               {.ip_src = RTE_IPv4(192,168,1,2)},              /* should not match */
+               {.ip_src = RTE_IPv4(192,168,1,50)},             /* should not match */
+               {.ip_dst = RTE_IPv4(192,168,2,50), .allow = 1}, /* should match 1 */
+               {.ip_dst = RTE_IPv4(192,168,1,49), .allow = 2}, /* should match 2 */
+               {.ip_dst = RTE_IPv4(192,168,1,50), .allow = 2,
                                .deny = 3},                         /* should match 2, 3 */
 
                {.vlan = 0x64, .allow = 7},            /* should match 7 */
@@ -479,20 +515,20 @@ struct ipv4_7tuple acl_test_data[] = {
                {.proto = 0x5, .allow = 22, .deny = 23},  /* should match 22, 23 */
 
 /* testing matching multiple rules at once */
-               {.vlan = 0x5, .ip_src = IPv4(10,1,1,1),
+               {.vlan = 0x5, .ip_src = RTE_IPv4(10,1,1,1),
                                .allow = 5, .deny = 9},               /* should match 5, 9 */
-               {.vlan = 0x5, .ip_src = IPv4(192,168,2,50),
+               {.vlan = 0x5, .ip_src = RTE_IPv4(192,168,2,50),
                                .allow = 8, .deny = 9},               /* should match 8, 9 */
-               {.vlan = 0x55, .ip_src = IPv4(192,168,1,49),
+               {.vlan = 0x55, .ip_src = RTE_IPv4(192,168,1,49),
                                .allow = 8},                          /* should match 8 */
                {.port_dst = 80, .port_src = 1024,
                                .allow = 13, .deny = 20},             /* should match 13,20 */
                {.port_dst = 79, .port_src = 1024,
                                .allow = 14, .deny = 20},             /* should match 14,20 */
-               {.proto = 0x5, .ip_dst = IPv4(192,168,2,50),
+               {.proto = 0x5, .ip_dst = RTE_IPv4(192,168,2,50),
                                .allow = 1, .deny = 23},               /* should match 1, 23 */
 
-               {.proto = 0x5, .ip_dst = IPv4(192,168,1,50),
+               {.proto = 0x5, .ip_dst = RTE_IPv4(192,168,1,50),
                                .allow = 2, .deny = 23},              /* should match 2, 23 */
                {.vlan = 0x64, .domain = 0x5,
                                .allow = 11, .deny = 12},             /* should match 11, 12 */
@@ -501,16 +537,16 @@ struct ipv4_7tuple acl_test_data[] = {
                {.proto = 0x5, .port_dst = 80,
                                .allow = 13, .deny = 23},             /* should match 13, 23 */
                {.proto = 0x51, .port_src = 5000},            /* should not match */
-               {.ip_src = IPv4(192,168,1,50),
-                               .ip_dst = IPv4(10,0,0,0),
+               {.ip_src = RTE_IPv4(192,168,1,50),
+                               .ip_dst = RTE_IPv4(10,0,0,0),
                                .proto = 0x51,
                                .port_src = 5000,
                                .port_dst = 5000},                    /* should not match */
 
 /* test full packet rules */
                {
-                               .ip_dst = IPv4(1,2,100,200),
-                               .ip_src = IPv4(5,6,7,254),
+                               .ip_dst = RTE_IPv4(1,2,100,200),
+                               .ip_src = RTE_IPv4(5,6,7,254),
                                .proto = 0x5,
                                .vlan = 0x8100,
                                .domain = 0x64,
@@ -520,8 +556,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .deny = 23
                }, /* should match 23, 24 */
                {
-                               .ip_dst = IPv4(5,6,7,254),
-                               .ip_src = IPv4(1,2,100,200),
+                               .ip_dst = RTE_IPv4(5,6,7,254),
+                               .ip_src = RTE_IPv4(1,2,100,200),
                                .proto = 0x5,
                                .vlan = 0x8100,
                                .domain = 0x64,
@@ -531,8 +567,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .deny = 25
                }, /* should match 13, 25 */
                {
-                               .ip_dst = IPv4(1,10,20,30),
-                               .ip_src = IPv4(5,6,7,8),
+                               .ip_dst = RTE_IPv4(1,10,20,30),
+                               .ip_src = RTE_IPv4(5,6,7,8),
                                .proto = 0x5,
                                .vlan = 0x64,
                                .port_src = 12345,
@@ -541,8 +577,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .deny = 23
                }, /* should match 23, 26 */
                {
-                               .ip_dst = IPv4(5,6,7,8),
-                               .ip_src = IPv4(1,10,20,30),
+                               .ip_dst = RTE_IPv4(5,6,7,8),
+                               .ip_src = RTE_IPv4(1,10,20,30),
                                .proto = 0x5,
                                .vlan = 0x64,
                                .port_src = 12345,
@@ -551,8 +587,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .deny = 27
                }, /* should match 13, 27 */
                {
-                               .ip_dst = IPv4(2,2,3,4),
-                               .ip_src = IPv4(4,6,7,8),
+                               .ip_dst = RTE_IPv4(2,2,3,4),
+                               .ip_src = RTE_IPv4(4,6,7,8),
                                .proto = 0x5,
                                .vlan = 0x64,
                                .port_src = 12345,
@@ -561,8 +597,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .deny = 23
                }, /* should match 13, 23 */
                {
-                               .ip_dst = IPv4(1,2,3,4),
-                               .ip_src = IPv4(4,6,7,8),
+                               .ip_dst = RTE_IPv4(1,2,3,4),
+                               .ip_src = RTE_IPv4(4,6,7,8),
                                .proto = 0x5,
                                .vlan = 0x64,
                                .port_src = 12345,
@@ -574,8 +610,8 @@ struct ipv4_7tuple acl_test_data[] = {
 
 /* visual separator! */
                {
-                               .ip_dst = IPv4(1,2,100,200),
-                               .ip_src = IPv4(5,6,7,254),
+                               .ip_dst = RTE_IPv4(1,2,100,200),
+                               .ip_src = RTE_IPv4(5,6,7,254),
                                .proto = 0x55,
                                .vlan = 0x8000,
                                .domain = 0x6464,
@@ -584,8 +620,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .allow = 10
                }, /* should match 10 */
                {
-                               .ip_dst = IPv4(5,6,7,254),
-                               .ip_src = IPv4(1,2,100,200),
+                               .ip_dst = RTE_IPv4(5,6,7,254),
+                               .ip_src = RTE_IPv4(1,2,100,200),
                                .proto = 0x55,
                                .vlan = 0x8100,
                                .domain = 0x6464,
@@ -594,8 +630,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .allow = 10
                }, /* should match 10 */
                {
-                               .ip_dst = IPv4(1,10,20,30),
-                               .ip_src = IPv4(5,6,7,8),
+                               .ip_dst = RTE_IPv4(1,10,20,30),
+                               .ip_src = RTE_IPv4(5,6,7,8),
                                .proto = 0x55,
                                .vlan = 0x64,
                                .port_src = 12345,
@@ -603,8 +639,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .allow = 7
                }, /* should match 7 */
                {
-                               .ip_dst = IPv4(5,6,7,8),
-                               .ip_src = IPv4(1,10,20,30),
+                               .ip_dst = RTE_IPv4(5,6,7,8),
+                               .ip_src = RTE_IPv4(1,10,20,30),
                                .proto = 0x55,
                                .vlan = 0x64,
                                .port_src = 12345,
@@ -612,8 +648,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .allow = 7
                }, /* should match 7 */
                {
-                               .ip_dst = IPv4(2,2,3,4),
-                               .ip_src = IPv4(4,6,7,8),
+                               .ip_dst = RTE_IPv4(2,2,3,4),
+                               .ip_src = RTE_IPv4(4,6,7,8),
                                .proto = 0x55,
                                .vlan = 0x64,
                                .port_src = 12345,
@@ -621,8 +657,8 @@ struct ipv4_7tuple acl_test_data[] = {
                                .allow = 7
                }, /* should match 7 */
                {
-                               .ip_dst = IPv4(1,2,3,4),
-                               .ip_src = IPv4(4,6,7,8),
+                               .ip_dst = RTE_IPv4(1,2,3,4),
+                               .ip_src = RTE_IPv4(4,6,7,8),
                                .proto = 0x50,
                                .vlan = 0x6466,
                                .port_src = 12345,