git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ethdev: add represented port action to flow API
[dpdk.git]
/
app
/
test
/
test_table_acl.c
diff --git
a/app/test/test_table_acl.c
b/app/test/test_table_acl.c
index
33e2f6e
..
0bdf76a
100644
(file)
--- a/
app/test/test_table_acl.c
+++ b/
app/test/test_table_acl.c
@@
-2,15
+2,12
@@
* Copyright(c) 2010-2014 Intel Corporation
*/
* Copyright(c) 2010-2014 Intel Corporation
*/
+#include <rte_ip.h>
+#include <rte_string_fns.h>
#include <rte_hexdump.h>
#include "test_table.h"
#include "test_table_acl.h"
#include <rte_hexdump.h>
#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.
**/
/*
* Rule and trace formats definitions.
**/
@@
-115,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);
GET_CB_FIELD(in, d, 0, UINT8_MAX, '/');
GET_CB_FIELD(in, m, 0, sizeof(uint32_t) * CHAR_BIT, 0);
- addr[0] =
IPv
4(a, b, c, d);
+ addr[0] =
RTE_IPV
4(a, b, c, d);
mask_len[0] = m;
return 0;
mask_len[0] = m;
return 0;
@@
-467,7
+464,7
@@
setup_acl_pipeline(void)
memset(&keys[n], 0, sizeof(struct rte_table_acl_rule_add_params));
key_array[n] = &keys[n];
memset(&keys[n], 0, sizeof(struct rte_table_acl_rule_add_params));
key_array[n] = &keys[n];
- s
nprintf(line, sizeof(line), "%s", lines[n]
);
+ s
trlcpy(line, lines[n], sizeof(line)
);
printf("PARSING [%s]\n", line);
ret = parser(line, &keys[n]);
printf("PARSING [%s]\n", line);
ret = parser(line, &keys[n]);
@@
-509,7
+506,7
@@
setup_acl_pipeline(void)
memset(&keys[n], 0, sizeof(struct rte_table_acl_rule_delete_params));
key_array[n] = &keys[n];
memset(&keys[n], 0, sizeof(struct rte_table_acl_rule_delete_params));
key_array[n] = &keys[n];
- s
nprintf(line, sizeof(line), "%s", lines[n]
);
+ s
trlcpy(line, lines[n], sizeof(line)
);
printf("PARSING [%s]\n", line);
ret = parse_cb_ipv4_rule_del(line, &keys[n]);
printf("PARSING [%s]\n", line);
ret = parse_cb_ipv4_rule_del(line, &keys[n]);
@@
-545,7
+542,7
@@
setup_acl_pipeline(void)
parser = parse_cb_ipv4_rule;
for (n = 1; n <= 5; n++) {
parser = parse_cb_ipv4_rule;
for (n = 1; n <= 5; n++) {
- s
nprintf(line, sizeof(line), "%s", lines[n-1]
);
+ s
trlcpy(line, lines[n - 1], sizeof(line)
);
printf("PARSING [%s]\n", line);
ret = parser(line, &rule_params);
printf("PARSING [%s]\n", line);
ret = parser(line, &rule_params);
@@
-571,7
+568,7
@@
setup_acl_pipeline(void)
/* delete a few rules */
for (n = 2; n <= 3; n++) {
/* delete a few rules */
for (n = 2; n <= 3; n++) {
- s
nprintf(line, sizeof(line), "%s", lines[n-1]
);
+ s
trlcpy(line, lines[n - 1], sizeof(line)
);
printf("PARSING [%s]\n", line);
ret = parser(line, &rule_params);
printf("PARSING [%s]\n", line);
ret = parser(line, &rule_params);
@@
-598,7
+595,7
@@
setup_acl_pipeline(void)
/* Try to add duplicates */
for (n = 1; n <= 5; n++) {
/* Try to add duplicates */
for (n = 1; n <= 5; n++) {
- s
nprintf(line, sizeof(line), "%s", lines[n-1]
);
+ s
trlcpy(line, lines[n - 1], sizeof(line)
);
printf("PARSING [%s]\n", line);
ret = parser(line, &rule_params);
printf("PARSING [%s]\n", line);
ret = parser(line, &rule_params);
@@
-661,8
+658,8
@@
test_pipeline_single_filter(int expected_count)
sizeof(struct ipv4_5tuple));
five_tuple.proto = j;
sizeof(struct ipv4_5tuple));
five_tuple.proto = j;
- five_tuple.ip_src = rte_bswap32(
IPv
4(192, 168, j, 1));
- five_tuple.ip_dst = rte_bswap32(
IPv
4(10, 4, j, 1));
+ five_tuple.ip_src = rte_bswap32(
RTE_IPV
4(192, 168, j, 1));
+ five_tuple.ip_dst = rte_bswap32(
RTE_IPV
4(10, 4, j, 1));
five_tuple.port_src = rte_bswap16(100 + j);
five_tuple.port_dst = rte_bswap16(200 + j);
five_tuple.port_src = rte_bswap16(100 + j);
five_tuple.port_dst = rte_bswap16(200 + j);