X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_table_acl.c;h=0bdf76ab70b36eea1e17fe67273945cbab9d598d;hb=b480c5fd54718359f9de339d0804c0a2c184339d;hp=33e2f6ee64b2244e86fde414c4c14456f72e8832;hpb=a9de470cc7c0649221e156fc5f30a2dbdfe7c166;p=dpdk.git

diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c
index 33e2f6ee64..0bdf76ab70 100644
--- a/app/test/test_table_acl.c
+++ b/app/test/test_table_acl.c
@@ -2,15 +2,12 @@
  * 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"
 
-#define IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) |		\
-	(((b) & 0xff) << 16) |						\
-	(((c) & 0xff) << 8) |						\
-	((d) & 0xff))
-
 /*
  * 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);
 
-	addr[0] = IPv4(a, b, c, d);
+	addr[0] = RTE_IPV4(a, b, c, d);
 	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];
 
-			snprintf(line, sizeof(line), "%s", lines[n]);
+			strlcpy(line, lines[n], sizeof(line));
 			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];
 
-			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]);
@@ -545,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);
@@ -571,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);
@@ -598,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);
@@ -661,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);