修改pkt_dump捕包逻辑,unknown靠tcpdump_mesa使用bpf过滤条件实现; 修改cmake/Package.cmake, 增加配置文件;v4.2.0

20 files changed, 44 insertions, 38 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e937da4..785c7ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,6 +208,10 @@ install(FILES bin/plug/conflist.inf DESTINATION plug COMPONENT PROFILE)
 install(FILES bin/etc/send_gdev.conf DESTINATION etc COMPONENT PROFILE)
 install(FILES bin/etc/send_route.conf DESTINATION etc COMPONENT PROFILE)
 install(FILES bin/etc/sapp_log.conf DESTINATION etc COMPONENT PROFILE)
+install(FILES bin/etc/asymmetric_addr_layer.conf DESTINATION etc COMPONENT PROFILE)
+install(FILES bin/etc/asymmetric_presence_layer.conf DESTINATION etc COMPONENT PROFILE)
+install(FILES bin/etc/vlan_flipping_map.conf DESTINATION etc COMPONENT PROFILE)
+install(FILES bin/etc/stream_compare_layer.conf DESTINATION etc COMPONENT PROFILE)
 
 if(NOT ENABLE_STATIC_LINK)
 
diff --git a/bin/etc/asymmetric_addr_layer.conf b/bin/etc/asymmetric_addr_layer.conf
index d0bc457..3f856c9 100644
--- a/bin/etc/asymmetric_addr_layer.conf
+++ b/bin/etc/asymmetric_addr_layer.conf
@@ -8,10 +8,7 @@
 # []表示某个层的index, 从最外层ethernet开始, 从0开始计数,  *表示不关心具体在哪层,只要地址类型符合即可  
 #pattern: asymmetric_layer_name[layer index]
 
-ethernet[1]
-ethernet[2]
-ethernet[3]
-ethernet[4]
+ethernet[*]
 vlan[*]
 mpls[*]
 gre[*]
diff --git a/bin/etc/sapp.toml b/bin/etc/sapp.toml
index 7af2366..44d4eac 100644
--- a/bin/etc/sapp.toml
+++ b/bin/etc/sapp.toml
@@ -158,10 +158,6 @@ dictator_enable=1
 [TOOLS]
     [tools.pkt_dump]
     enabled=1
-### note, packet_category options value:[all, diagnose]    
-### all is the default parameter, means dump the all packet which match BSD_packet_filter.
-### diagnose means only dump the illegal, unknown, or other error packet.
-    packet_category=all
 ### note, mode options value:[storage, udp_socket]
     mode=udp_socket
     BSD_packet_filter=""
diff --git a/bin/etc/vlan_flipping_map.conf b/bin/etc/vlan_flipping_map.conf
index 45e6e9a..d51460f 100644
--- a/bin/etc/vlan_flipping_map.conf
+++ b/bin/etc/vlan_flipping_map.conf
@@ -1,7 +1,11 @@
 #for inline a device vlan flipping 
-#pattern: 
+#数据包来自C路由器端, 即C2I(I2E)方向, 
+#数据包来自I路由器端, 即I2C(E2I)方向, 
+#平台会根据vlan_id,设置当前包route_dir的值, 以便上层业务插件做两个方向的流量统计,
+#如果一对vlan_id写反了, 网络是通的, 但是I2E,E2I的流量统计就颠倒了.
+#配置文件格式, pattern:
+#来自C路由器vlan_id	  	来自I路由器vlan_id   	是否开启mac地址翻转
 #C_router_vlan_id  I_router_vlan_id mac_flipping_enable
 1001	1002	1
 1003	1004	1
 4000	4001	0
-
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 8652293..2417cd9 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -65,7 +65,12 @@ set(CPACK_RPM_EXECUTABLE_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFI
 				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/plug/conflist.inf"
 				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/gdev_block.conf"
 				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/send_gdev.conf"
-				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/send_route.conf")
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/send_route.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/asymmetric_addr_layer.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/asymmetric_presence_layer.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/vlan_flipping_map.conf"
+				"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/stream_compare_layer.conf"
+				)
 
 # Must uninstall the debug package before install release package
 set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX})
diff --git a/include/private/stream_internal.h b/include/private/stream_internal.h
index 372d334..7b06310 100644
--- a/include/private/stream_internal.h
+++ b/include/private/stream_internal.h
@@ -73,7 +73,7 @@ typedef struct {
 	int device_index;/* �ж������ʱ, Ҫ��֤���ĸ������ʹ��ĸ����� */
 	unsigned short vlan_flipping_couple[2]; /*2020-09-28 lijia add, in host order, vlan flipping for adev, index0��ʾ�յ���ǰ����vlan_id, index1��ʾԭ��ת����vlan_id */
 	unsigned char mac_flipping_enable;
-	char diagnose_to_dump; /* ��ij�ִ������ݰ�, ����pkt_dump�洢��udp socket���͸�tcpdump_mesa */
+	char diagnose_error_to_dump; /* ��ij�ִ������ݰ�, ����pkt_dump�洢��udp socket���͸�tcpdump_mesa */
 }raw_pkt_t;
 
 
diff --git a/src/common/net_common.c b/src/common/net_common.c
index b3a8c30..5cdb99a 100644
--- a/src/common/net_common.c
+++ b/src/common/net_common.c
@@ -505,7 +505,7 @@ static int vlan8021q_jump_to_layer(const char *raw_data,  int raw_layer_type, in
 		return 0;
 	}
 
-	set_vlan_addr(&vlan_addr, raw_data);
+	set_vlan_addr(&vlan_addr, (const unsigned char *)raw_data);
 	vlan_layer_len = sizeof(struct mesa_vlan_hdr) * vlan_addr.src_vlan_layer_num;
 	next_layer_data = raw_data + vlan_layer_len;
 	vhdr = (struct mesa_vlan_hdr *)&vlan_addr.src_vlan_pkt[vlan_addr.src_vlan_layer_num-1];
diff --git a/src/config/config_parse.cpp b/src/config/config_parse.cpp
index 29be3a8..e12381a 100644
--- a/src/config/config_parse.cpp
+++ b/src/config/config_parse.cpp
@@ -360,7 +360,7 @@ static int parse_vlan_flipping_map_config(void)
 static int embed_layer_t_pton(char *config_val, embed_layer_t *result)
 {
 	enum addr_type_t addrtype;
-	int i, j, ret, layer_index;
+	int  j, ret, layer_index;
 	const char *delim = "[] ";
 	char *save_ptr;
 	const char *layer_type_string;
@@ -526,7 +526,7 @@ static int parse_asymmetric_addr_layer_config(void)
 */
 static int parse_asymmetric_presence_layer_config(void)
 {
-	int i, j, ret, asymmetric_presence_layer_config_num = 0;
+	int i, ret, asymmetric_presence_layer_config_num = 0;
 	FILE *fp;
 	char line_cont[MAX_INPUT];
 	char layer_name[MAX_INPUT], under_layer_name[MAX_INPUT], upper_layer_name[MAX_INPUT];
@@ -1297,7 +1297,7 @@ void sapp_init_breakpad_mini(void)
 #ifdef GIT_VERSION
 	__attribute__((__used__)) const char *sapp_git_ver = GIT_VERSION;
 #else
-	 const char * sapp_git_ver = "sapp_version_unkonw"
+	 const char * sapp_git_ver = "sapp_version_unkonw";
 #endif
 	struct breakpad_instance * g_breakpad = breakpad_init(default_config_file, "breakpad", sapp_global_val->individual_fixed.log_handle,  sapp_git_ver);
 	if(g_breakpad == NULL){exit(-1);}
diff --git a/src/dealpkt/deal_ethernet.c b/src/dealpkt/deal_ethernet.c
index a859614..b54ff6c 100644
--- a/src/dealpkt/deal_ethernet.c
+++ b/src/dealpkt/deal_ethernet.c
@@ -20,7 +20,7 @@ static inline void set_mac_addr(struct layer_addr_mac *addr, const struct mesa_e
 

 static inline int should_create_empty_mpls_layer_for_symmetric(const struct streaminfo *pstream, unsigned short next_eth_type)

 {

-	const const struct streaminfo_private *pstream_pr = (const struct streaminfo_private *)pstream;

+	const struct streaminfo_private *pstream_pr = (const struct streaminfo_private *)pstream;

 	int this_layer_type = (int)ADDR_TYPE_MAC;

 	int this_layer_index = pstream_pr->layer_index;

 	int next_layer_index = pstream_pr->layer_index + 1;

@@ -188,7 +188,7 @@ int eth_entry(struct streaminfo_private *fstream_pr, const void *this_layer_hdr,
 

 			default:

 				/* unknown protocol */

-				((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;

+

 				local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;

 				local_sys_stat->length[SAPP_STAT_RCV_UNKNOWN] += (unsigned long long)raw_pkt->raw_pkt_len;				

 				if(NET_CONN_SERIAL_GDEV == g_topology_mode){

diff --git a/src/dealpkt/deal_gprs_tunnel.c b/src/dealpkt/deal_gprs_tunnel.c
index 6c9013d..ad61eeb 100644
--- a/src/dealpkt/deal_gprs_tunnel.c
+++ b/src/dealpkt/deal_gprs_tunnel.c
@@ -116,7 +116,7 @@ int gtp_entry(struct streaminfo_private *pfstream_pr,void *this_layer_data,int t
         {
             local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;
 			local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]+= raw_pkt->raw_pkt_len;	
-			((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;
+			((raw_pkt_t *)raw_pkt)->diagnose_error_to_dump = 1;
             sapp_runtime_log(20, "illegal left Ipv4 len %d, total len %d!\n", left_pkt_len, ntohs(ip4_hdr->tot_len));
             return DROP;
         }
diff --git a/src/dealpkt/deal_ipv4.c b/src/dealpkt/deal_ipv4.c
index 0790bf9..c4b766d 100644
--- a/src/dealpkt/deal_ipv4.c
+++ b/src/dealpkt/deal_ipv4.c
@@ -602,7 +602,7 @@ int ipv4_entry(struct streaminfo_private *pfstream_pr, const void *this_layer_da
 	if(unlikely(checkipv4pkt(a_packet, raw_pkt) < 0)){

 		local_sys_stat->count[SAPP_STAT_DROP_IPV4]++;

 		local_sys_stat->length[SAPP_STAT_DROP_IPV4]+=raw_pkt->raw_pkt_len;

-		((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;

+		((raw_pkt_t *)raw_pkt)->diagnose_error_to_dump = 1;

 		return PASS;

 	}

 

@@ -632,7 +632,7 @@ int ipv4_entry(struct streaminfo_private *pfstream_pr, const void *this_layer_da
 	if(unlikely(pfstream_pr->layer_index >= SAPP_SUPPORT_LAYER_NUM_MAX)){

 		local_sys_stat->count[SAPP_STAT_DROP_IPV4]++;

 		sapp_runtime_log(RLOG_LV_INFO, "ipv4_entry: layer index more than:%d", pfstream_pr->layer_index);

-		((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;

+		((raw_pkt_t *)raw_pkt)->diagnose_error_to_dump = 1;

 		return PASS;

 	}else{

 		pstream_pr->layer_index = pfstream_pr->layer_index + 1;

diff --git a/src/dealpkt/deal_ipv6.c b/src/dealpkt/deal_ipv6.c
index b34f38c..e964708 100644
--- a/src/dealpkt/deal_ipv6.c
+++ b/src/dealpkt/deal_ipv6.c
@@ -779,14 +779,14 @@ int ipv6_entry(struct streaminfo_private *pfstream_pr, const void *this_layer_hd
 	if(unlikely(checkipv6pkt(a_packet, (int)payload_len, raw_pkt->raw_pkt_len) < 0)){

 		local_sys_stat->count[SAPP_STAT_DROP_IPV6]++;

 		local_sys_stat->length[SAPP_STAT_DROP_IPV6]+=raw_pkt->raw_pkt_len;

-		((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;

+		((raw_pkt_t *)raw_pkt)->diagnose_error_to_dump = 1;

 		return PASS;

 	}

 

 	if(unlikely(pfstream_pr->layer_index >= SAPP_SUPPORT_LAYER_NUM_MAX)){

 		local_sys_stat->count[SAPP_STAT_DROP_IPV6]++;

 		sapp_runtime_log(RLOG_LV_INFO, "ipv6_entry: layer index more than:%d", pfstream_pr->layer_index);

-		((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;

+		((raw_pkt_t *)raw_pkt)->diagnose_error_to_dump = 1;

 		return PASS;

 	}else{

 		plocal_stream_pr->layer_index = pfstream_pr->layer_index + 1;

@@ -931,7 +931,6 @@ int ipv6_entry(struct streaminfo_private *pfstream_pr, const void *this_layer_hd
 			default:

 				local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;

 				local_sys_stat->length[SAPP_STAT_RCV_UNKNOWN]+=raw_pkt->raw_pkt_len;

-				((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;

 				sapp_runtime_log(20, "unsupport Ipv6 protocol:%u!\n", next_hdr_type);			

 				goto err_exit;

 			break;

diff --git a/src/dealpkt/deal_mac_in_mac.c b/src/dealpkt/deal_mac_in_mac.c
index b4ac2bb..fe7548e 100644
--- a/src/dealpkt/deal_mac_in_mac.c
+++ b/src/dealpkt/deal_mac_in_mac.c
@@ -21,7 +21,7 @@ static void set_mac_in_mac_addr(const struct mesa_ethernet_hdr *outer_ether_hdr,
 

 static inline int should_create_empty_mpls_layer_for_symmetric(const struct streaminfo *pstream, unsigned short next_eth_type)

 {

-	const const struct streaminfo_private *pstream_pr = (const struct streaminfo_private *)pstream;

+	const struct streaminfo_private *pstream_pr = (const struct streaminfo_private *)pstream;

 	int this_layer_type = (int)ADDR_TYPE_MAC;

 	int this_layer_index = pstream_pr->layer_index;

 	int next_layer_index = pstream_pr->layer_index + 1;

@@ -126,7 +126,6 @@ int mac_in_mac_entry(struct streaminfo_private *fstream_pr, const void *this_lay
 				/* unknown protocol */

 				local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;

 				local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]+= raw_pkt->raw_pkt_len;	

-				((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;

 				sapp_runtime_log(20, "MAC-IN-MAC unknown protocol: 0x%x\n", eth_type);

 				ret = PASS;

 			break;

diff --git a/src/dealpkt/deal_mpls.c b/src/dealpkt/deal_mpls.c
index 4b2b2ac..cd5116a 100644
--- a/src/dealpkt/deal_mpls.c
+++ b/src/dealpkt/deal_mpls.c
@@ -114,7 +114,7 @@ int mpls_uc_entry(struct streaminfo_private *pfstream_pr,const void *this_layer_
 	if(set_mpls_addr(&addr, (unsigned char *)this_layer_data) < 0){
 		local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;
 		local_sys_stat->length[SAPP_STAT_RCV_UNKNOWN]+= raw_pkt->raw_pkt_len; 	
-		((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;
+		((raw_pkt_t *)raw_pkt)->diagnose_error_to_dump = 1;
 		return PASS;
 	}
 
@@ -176,7 +176,7 @@ int mpls_uc_entry(struct streaminfo_private *pfstream_pr,const void *this_layer_
 		{
 			local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;
 			local_sys_stat->length[SAPP_STAT_RCV_UNKNOWN]+= raw_pkt->raw_pkt_len;  
-			((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;
+			((raw_pkt_t *)raw_pkt)->diagnose_error_to_dump = 1;
             sapp_runtime_log(20, "illegal left Ipv4 len %d, total len %d!\n", left_pkt_len, ntohs(ip4_hdr->ip_len));            
 			inject_to_eth_flag = 1;
 		}
@@ -201,7 +201,7 @@ int mpls_uc_entry(struct streaminfo_private *pfstream_pr,const void *this_layer_
 		{
 			local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;
 			local_sys_stat->length[SAPP_STAT_RCV_UNKNOWN]+= raw_pkt->raw_pkt_len;     
-			((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;
+			((raw_pkt_t *)raw_pkt)->diagnose_error_to_dump = 1;
             sapp_runtime_log(20, "illegal left Ipv6 len %d, total len %d!\n", left_pkt_len, ntohs(ip6_hdr->ip6_payload_len));        
 			inject_to_eth_flag = 1;
 		}
@@ -221,7 +221,7 @@ int mpls_uc_entry(struct streaminfo_private *pfstream_pr,const void *this_layer_
 			 if(left_pkt_len < sizeof(struct mesa_ethernet_hdr) + sizeof(struct mesa_ip4_hdr) + sizeof(struct mesa_udp_hdr)){ /* С����С�Ϸ�ethernet+ip+udp���ݰ����� */
 				 local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;
 				 local_sys_stat->length[SAPP_STAT_RCV_UNKNOWN]+= raw_pkt->raw_pkt_len;	 
-				 ((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;
+				 ((raw_pkt_t *)raw_pkt)->diagnose_error_to_dump = 1;
 
 				 sapp_runtime_log(20, "MPLS next layer type: 0x%x, but left len only:%d, pkt seq:%llu\n", *next_layer_hdr,left_pkt_len, local_sys_stat->count[SAPP_STAT_RCV_RAW]);
 				 return PASS;
diff --git a/src/dealpkt/deal_pppoe.c b/src/dealpkt/deal_pppoe.c
index 330eedd..e4b8d2d 100644
--- a/src/dealpkt/deal_pppoe.c
+++ b/src/dealpkt/deal_pppoe.c
@@ -66,7 +66,6 @@ int pppoe_session_entry(struct streaminfo_private *pfstream_pr,const void *this_
 		local_sys_stat = &sapp_global_val->mthread_volatile[thread_num]->sys_stat;

 		local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;

 		local_sys_stat->length[SAPP_STAT_RCV_UNKNOWN] += (unsigned long long)raw_pkt->raw_pkt_len;		

-		((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;

 	}

 

 	return ret;

diff --git a/src/dealpkt/deal_udp.c b/src/dealpkt/deal_udp.c
index 87f55a0..fa0f45e 100644
--- a/src/dealpkt/deal_udp.c
+++ b/src/dealpkt/deal_udp.c
@@ -885,7 +885,6 @@ int process_ipv4_pkt (struct streamindex *pfindex,const struct mesa_ip4_hdr * a_
 			/* unknown protocol */	
 			local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;
 			local_sys_stat->length[SAPP_STAT_RCV_UNKNOWN]+= raw_pkt->raw_pkt_len;		
-			((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;
 			sapp_runtime_log(RLOG_LV_INFO, "unsupport Ipv4 protocol:%u, pkt seq:%llu\n", a_packet->ip_p,local_sys_stat->count[SAPP_STAT_RCV_RAW]);
 		break;
 	}
diff --git a/src/dealpkt/deal_vlan.c b/src/dealpkt/deal_vlan.c
index c9428c9..6f512be 100644
--- a/src/dealpkt/deal_vlan.c
+++ b/src/dealpkt/deal_vlan.c
@@ -123,7 +123,6 @@ int vlan_8021q_entry(struct streaminfo_private *pfstream_pr,const void *this_lay
 			/* unknown protocol */	

 			local_sys_stat->count[SAPP_STAT_RCV_UNKNOWN]++;

 			local_sys_stat->length[SAPP_STAT_RCV_UNKNOWN]+= raw_pkt->raw_pkt_len;

-			((raw_pkt_t *)raw_pkt)->diagnose_to_dump = 1;

 

 			sapp_runtime_log(20, "VLAN unknown protocol: 0x%x, pkt seq:%llu\n", next_layer_type, local_sys_stat->count[SAPP_STAT_RCV_RAW]);

 			

diff --git a/src/packet_io/cycle_pkt_dump_through_write_offset.c b/src/packet_io/cycle_pkt_dump_through_write_offset.c
index b35312b..dd52f74 100644
--- a/src/packet_io/cycle_pkt_dump_through_write_offset.c
+++ b/src/packet_io/cycle_pkt_dump_through_write_offset.c
@@ -649,6 +649,11 @@ void cycle_pkt_dump(int thread_seq, const raw_pkt_t *p_raw_pkt)
 
 }
 
+/*
+	TODO:
+		�˴��ij�tcpdump_mesa���ݲ���, ��̬�ı������ģʽ.
+		��Ҫ��cycle_pkt_dump()�ƶ������ݰ��������̵����, ���ܸ���raw_pkt�еı�Ǿ�����ô����.
+*/
 void cycle_diagnose_pkt_dump(int thread_seq, const raw_pkt_t *p_raw_pkt)
 {
 	if(likely(0 == G_PKT_DUMP_SW)){
@@ -656,13 +661,13 @@ void cycle_diagnose_pkt_dump(int thread_seq, const raw_pkt_t *p_raw_pkt)
 	}
 
 	if((PKTDUMP_CATEGORY_DIAGNOSE != sapp_global_val->config.tools.pkt_dump.packet_category_bin)
-	  || (0 == p_raw_pkt->diagnose_to_dump)){
+	  || (0 == p_raw_pkt->diagnose_error_to_dump)){
 		return;
 	}
 
 	__do_cycle_pkt_dump(thread_seq, p_raw_pkt);
 
-	((raw_pkt_t *)p_raw_pkt)->diagnose_to_dump = 0;
+	((raw_pkt_t *)p_raw_pkt)->diagnose_error_to_dump = 0;
 }
 
 
diff --git a/src/packet_io/packet_io.c b/src/packet_io/packet_io.c
index 8607d53..f00cc36 100644
--- a/src/packet_io/packet_io.c
+++ b/src/packet_io/packet_io.c
@@ -677,7 +677,7 @@ static int mesa_default_pkt_cb(const raw_pkt_t *p_raw_pkt, unsigned char dir, in
 		ret = g_platform_action_cb_fun(sapp_global_val->config.packet_io.depolyment_mode_bin, ret);
 	}
 
-	cycle_diagnose_pkt_dump(thread_num, p_raw_pkt);
+	//cycle_diagnose_pkt_dump(thread_num, p_raw_pkt);
 
 	if((DEPOLYMENT_MODE_INLINE == sapp_global_val->config.packet_io.depolyment_mode_bin) 
 	 && (PASS == ret)){
@@ -1043,7 +1043,7 @@ static int packet_io_send_by_manual_conf(MESA_send_handle *send_handle,int datal
     }
     else
     {
-        p_dst_mac = sapp_global_val->config.packet_io.inject_mode_single_gateway_dst_mac;
+        p_dst_mac = (unsigned char *)sapp_global_val->config.packet_io.inject_mode_single_gateway_dst_mac;
     }
     sendpacket_build_ethernet(p_dst_mac, sapp_global_val->config.packet_io.inject_mode_single_gateway_src_mac, ether_type, NULL, 0, send_handle->send_buf);
 
diff --git a/src/packet_io/packet_io_pcap.c b/src/packet_io/packet_io_pcap.c
index 5463b77..c41d698 100644
--- a/src/packet_io/packet_io_pcap.c
+++ b/src/packet_io/packet_io_pcap.c
@@ -1110,7 +1110,7 @@ retry:
 	pkt_queue_node.raw_pkt.magic_num = RAW_PKT_MAGIC_NUM; /* 2014-12-11 lijia add */

 	pkt_queue_node.raw_pkt.hd_hash = 0; /* 2016-05-05 lijia add, pcapģʽ��֧��Ӳ��HASH */

 	pkt_queue_node.raw_pkt.io_lib_pkt_reference = pkt_queue_node.raw_pkt.__lib_raw_pkt_data; /* ����dpdkģʽ, ���˱�����ֵ */

-	pkt_queue_node.raw_pkt.diagnose_to_dump = 0;

+	pkt_queue_node.raw_pkt.diagnose_error_to_dump = 0;

 

 	if(CAP_MODEL_PCAP_DUMPFILE == g_pcap_cap_mode){

 		/* ����ģʽ�±���û��routedir�ĸ���, Ϊ�˱��ڲ����ϲ�ҵ��, ʹ����ײ��ַ�Ƚ����һ��routedir */