X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=common%2FVIL%2Fpipeline_arpicmp%2Fpipeline_arpicmp.c;h=607d13d1962ed8f1957cd5e3f82b9db7bb6c17e7;hb=refs%2Fchanges%2F17%2F44317%2F1;hp=43e0be2d42238455e3c3be37a5ea41cc06795619;hpb=0e51437be874b6831e95639f4c1ad6b0133c2a28;p=samplevnf.git

diff --git a/common/VIL/pipeline_arpicmp/pipeline_arpicmp.c b/common/VIL/pipeline_arpicmp/pipeline_arpicmp.c
index 43e0be2d..607d13d1 100644
--- a/common/VIL/pipeline_arpicmp/pipeline_arpicmp.c
+++ b/common/VIL/pipeline_arpicmp/pipeline_arpicmp.c
@@ -28,9 +28,7 @@
 
 #include "app.h"
 #include "vnf_common.h"
-#ifndef VNF_ACL
 #include "lib_arp.h"
-#endif
 
 #include <rte_ip.h>
 #include <rte_udp.h>
@@ -72,6 +70,14 @@ struct cmd_arp_add_result {
 
 };
 
+uint16_t str2flowtype(char *string);
+int parse_flexbytes(const char *q_arg, uint8_t *flexbytes,
+	 uint16_t max_num);
+enum rte_eth_input_set_field str2inset(char *string);
+int app_pipeline_arpicmp_entry_dbg(struct app_params *app,
+			uint32_t pipeline_id, uint8_t *msg);
+
+
 static void
 cmd_arp_add_parsed(void *parsed_result,
 			 __rte_unused struct cmdline *cl, __rte_unused void *data)
@@ -97,9 +103,7 @@ cmd_arp_add_parsed(void *parsed_result,
 	} else {
 		memcpy(ipv6, params->ip.addr.ipv6.s6_addr, 16);
 		populate_nd_entry(&params->macaddr, ipv6, params->port_id
-				#ifndef VNF_ACL
 				, STATIC_ND
-				#endif
 				);
 	}
 }
@@ -155,30 +159,25 @@ cmd_arp_del_parsed(void *parsed_result,
 			 __rte_unused struct cmdline *cl, __rte_unused void *data)
 {
 	struct cmd_arp_del_result *params = parsed_result;
-	uint8_t ipv6[16];
-
-	#if 0
-	struct pipeline_arp_icmp_arp_key key;
-	key.type = PIPELINE_ARP_ICMP_ARP_IPV4;
-	key.key.ipv4.ip = rte_cpu_to_be_32(params->ip.addr.ipv4.s_addr);
-	key.key.ipv4.port_id = params->port_id;
-	remove_arp_entry(rte_bswap32(req->key.key.ipv4.ip),
-		req->key.key.ipv4.port_id);
-	#endif
-	struct arp_key_ipv4 arp_key;
-        arp_key.port_id = params->port_id;
-        arp_key.ip = rte_cpu_to_be_32(params->ip.addr.ipv4.s_addr);
-        arp_key.filler1 = 0;
-        arp_key.filler2 = 0;
-        arp_key.filler3 = 0;
-
-        struct arp_entry_data *new_arp_data = retrieve_arp_entry(arp_key, STATIC_ARP);
 
 	if (params->ip.family == AF_INET) {
+		struct arp_key_ipv4 arp_key;
+		arp_key.port_id = params->port_id;
+		arp_key.ip = rte_cpu_to_be_32(params->ip.addr.ipv4.s_addr);
+		arp_key.filler1 = 0;
+		arp_key.filler2 = 0;
+		arp_key.filler3 = 0;
+		struct arp_entry_data *new_arp_data = retrieve_arp_entry(arp_key, STATIC_ARP);
 		remove_arp_entry(new_arp_data, &arp_key);
 	} else {
-		memcpy(ipv6, params->ip.addr.ipv6.s6_addr, 16);
-		remove_nd_entry_ipv6(ipv6, params->port_id);
+		struct nd_key_ipv6 nd_key;
+		nd_key.port_id = params->port_id;
+		memcpy(&nd_key.ipv6[0], params->ip.addr.ipv6.s6_addr, 16);
+		nd_key.filler1 = 0;
+		nd_key.filler2 = 0;
+		nd_key.filler3 = 0;
+		struct nd_entry_data *new_nd_data = retrieve_nd_entry(nd_key, STATIC_ND);
+		remove_nd_entry_ipv6(new_nd_data, &nd_key);
 	}
 }
 
@@ -250,11 +249,7 @@ cmd_arp_req_parsed(void *parsed_result,
 		printf("ARP - requesting arp for ip 0x%x, port %d\n",
 					 params->ip.addr.ipv4.s_addr, params->port_id);
 
-	#ifdef VNF_ACL
-	request_arp_wrap(params->port_id, params->ip.addr.ipv4.s_addr);
-	#else
 	request_arp(params->port_id, params->ip.addr.ipv4.s_addr);
-	#endif
 	/*give pipeline number too*/
 }
 
@@ -401,7 +396,6 @@ static cmdline_parse_inst_t cmd_show_ports_info = {
 			 },
 };
 
-#ifndef VNF_ACL
 struct cmd_arp_dbg_result {
 	cmdline_fixed_string_t arpdbg_str;
 	uint32_t flag;
@@ -479,7 +473,6 @@ cmdline_parse_inst_t cmd_arp_timer = {
 		NULL,
 	},
 };
-#endif
 
 /*
  * Forwarding of packets in I/O mode.
@@ -967,8 +960,7 @@ cmdline_parse_inst_t cmd_set_fwd_mode = {
 
 #if 1
 
-static uint16_t
-str2flowtype(char *string)
+uint16_t str2flowtype(char *string)
 {
 	uint8_t i = 0;
 	static const struct {
@@ -998,7 +990,7 @@ str2flowtype(char *string)
 	return RTE_ETH_FLOW_UNKNOWN;
 }
 
-static inline int
+int
 parse_flexbytes(const char *q_arg, uint8_t *flexbytes, uint16_t max_num)
 {
 	char s[256];
@@ -1457,7 +1449,7 @@ struct cmd_set_hash_input_set_result {
 	cmdline_fixed_string_t select;
 };
 
-static enum rte_eth_input_set_field
+enum rte_eth_input_set_field
 str2inset(char *string)
 {
 	uint16_t i;
@@ -1981,7 +1973,7 @@ cmdline_parse_inst_t cmd_set_sym_hash_ena_per_port = {
 };
 #endif
 
-static int
+int
 app_pipeline_arpicmp_entry_dbg(struct app_params *app,
 					uint32_t pipeline_id, uint8_t *msg)
 {
@@ -2106,10 +2098,8 @@ static cmdline_parse_ctx_t pipeline_cmds[] = {
 /*      (cmdline_parse_inst_t *) & cmd_set_hash_input_set_5,*/
 	(cmdline_parse_inst_t *) &cmd_set_hash_global_config,
 	(cmdline_parse_inst_t *) &cmd_set_sym_hash_ena_per_port,
-	#ifndef VNF_ACL
 	(cmdline_parse_inst_t *) &cmd_arp_dbg,
 	(cmdline_parse_inst_t *) &cmd_arp_timer,
-	#endif
 	NULL,
 };