X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_table_acl.c;h=0bdf76ab70b36eea1e17fe67273945cbab9d598d;hb=e9703a54e41141ebcfd57db1d67d09ce61e58d29;hp=fe8e5457d27afeaf9fc1d81e4d3cfe8d7fac3257;hpb=48f2543cf0a88fc6f47b4e8ce3c736420c64bb92;p=dpdk.git diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c index fe8e5457d2..0bdf76ab70 100644 --- a/app/test/test_table_acl.c +++ b/app/test/test_table_acl.c @@ -1,45 +1,13 @@ -/*- - * 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 +#include #include #include "test_table.h" #include "test_table_acl.h" -#define IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) | \ - (((b) & 0xff) << 16) | \ - (((c) & 0xff) << 8) | \ - ((d) & 0xff)) - /* * Rule and trace formats definitions. **/ @@ -144,7 +112,7 @@ parse_ipv4_net(const char *in, uint32_t *addr, uint32_t *mask_len) GET_CB_FIELD(in, d, 0, UINT8_MAX, '/'); GET_CB_FIELD(in, m, 0, sizeof(uint32_t) * CHAR_BIT, 0); - addr[0] = IPv4(a, b, c, d); + addr[0] = RTE_IPV4(a, b, c, d); mask_len[0] = m; return 0; @@ -496,7 +464,7 @@ setup_acl_pipeline(void) memset(&keys[n], 0, sizeof(struct rte_table_acl_rule_add_params)); key_array[n] = &keys[n]; - snprintf(line, sizeof(line), "%s", lines[n]); + strlcpy(line, lines[n], sizeof(line)); printf("PARSING [%s]\n", line); ret = parser(line, &keys[n]); @@ -532,11 +500,13 @@ setup_acl_pipeline(void) struct rte_pipeline_table_entry *table_entries[5]; int key_found[5]; + memset(table_entries, 0, sizeof(table_entries)); + for (n = 0; n < 5; n++) { memset(&keys[n], 0, sizeof(struct rte_table_acl_rule_delete_params)); key_array[n] = &keys[n]; - snprintf(line, sizeof(line), "%s", lines[n]); + strlcpy(line, lines[n], sizeof(line)); printf("PARSING [%s]\n", line); ret = parse_cb_ipv4_rule_del(line, &keys[n]); @@ -572,7 +542,7 @@ setup_acl_pipeline(void) parser = parse_cb_ipv4_rule; for (n = 1; n <= 5; n++) { - snprintf(line, sizeof(line), "%s", lines[n-1]); + strlcpy(line, lines[n - 1], sizeof(line)); printf("PARSING [%s]\n", line); ret = parser(line, &rule_params); @@ -598,7 +568,7 @@ setup_acl_pipeline(void) /* delete a few rules */ for (n = 2; n <= 3; n++) { - snprintf(line, sizeof(line), "%s", lines[n-1]); + strlcpy(line, lines[n - 1], sizeof(line)); printf("PARSING [%s]\n", line); ret = parser(line, &rule_params); @@ -625,7 +595,7 @@ setup_acl_pipeline(void) /* Try to add duplicates */ for (n = 1; n <= 5; n++) { - snprintf(line, sizeof(line), "%s", lines[n-1]); + strlcpy(line, lines[n - 1], sizeof(line)); printf("PARSING [%s]\n", line); ret = parser(line, &rule_params); @@ -688,8 +658,8 @@ test_pipeline_single_filter(int expected_count) sizeof(struct ipv4_5tuple)); five_tuple.proto = j; - five_tuple.ip_src = rte_bswap32(IPv4(192, 168, j, 1)); - five_tuple.ip_dst = rte_bswap32(IPv4(10, 4, j, 1)); + five_tuple.ip_src = rte_bswap32(RTE_IPV4(192, 168, j, 1)); + five_tuple.ip_dst = rte_bswap32(RTE_IPV4(10, 4, j, 1)); five_tuple.port_src = rte_bswap16(100 + j); five_tuple.port_dst = rte_bswap16(200 + j); @@ -702,7 +672,8 @@ test_pipeline_single_filter(int expected_count) } /* Run pipeline once */ - rte_pipeline_run(p); + for (i = 0; i< N_PORTS; i++) + rte_pipeline_run(p); rte_pipeline_flush(p); @@ -712,14 +683,14 @@ test_pipeline_single_filter(int expected_count) void *objs[RING_TX_SIZE]; struct rte_mbuf *mbuf; - ret = rte_ring_sc_dequeue_burst(rings_tx[i], objs, 10); + ret = rte_ring_sc_dequeue_burst(rings_tx[i], objs, 10, NULL); if (ret <= 0) { printf("Got no objects from ring %d - error code %d\n", i, ret); } else { printf("Got %d object(s) from ring %d!\n", ret, i); for (j = 0; j < ret; j++) { - mbuf = (struct rte_mbuf *)objs[j]; + mbuf = objs[j]; rte_hexdump(stdout, "mbuf", rte_pktmbuf_mtod(mbuf, char *), 64); rte_pktmbuf_free(mbuf); @@ -745,7 +716,7 @@ fail: } int -test_table_ACL(void) +test_table_acl(void) {