kni_debug_log当a_packet==NULL时，也会记录日志，只是不记录四元组；

2 files changed, 9 insertions, 45 deletions

diff --git a/kni_comm.c b/kni_comm.c
index f80fb09..99febad 100644
--- a/kni_comm.c
+++ b/kni_comm.c
@@ -115,11 +115,12 @@ int kni_log_info(char* module,const struct layer_addr* addr,unsigned short proto
 
 int kni_log_debug(int level,char* module,const void* a_packet,const char* format,...)
 {
-	if((a_packet == NULL) || (level<g_kni_comminfo.logger_level))
+	if(level<g_kni_comminfo.logger_level)
 	{
 		return 0;
 	}
 
+
 	
 	unsigned short sport=0;
 	unsigned short dport=0;
@@ -141,6 +142,13 @@ int kni_log_debug(int level,char* module,const void* a_packet,const char* format
 	va_end(list);
 
 	
+	if(a_packet == NULL)
+	{
+		MESA_handle_runtime_log(g_kni_comminfo.logger,level,module,"%s",buf);
+		return 0;
+	}
+
+	
 
 	if(ipv4_hdr->ip_v==4)
 	{
diff --git a/kni_entry.c b/kni_entry.c
index 520a2d2..2c2d948 100644
--- a/kni_entry.c
+++ b/kni_entry.c
@@ -201,55 +201,12 @@ int kni_htable_del(const struct streaminfo* pstream,struct kni_pme_info* pmeinfo
 }
 
 
-/*
-int kni_htable_del(const struct streaminfo* pstream,const void* a_packet)
-{
-	int ret = 0;
-	struct stream_tuple4_v4 ipv4_addr;
-	struct stream_tuple4_v6 ipv6_addr;
-	
-	if((pstream->addr.addrtype == ADDR_TYPE_IPV4))
-	{
-		kni_get_ipaddr_v4((void*)a_packet,&ipv4_addr);
-		
-		ret = MESA_htable_del(g_kni_structinfo.htable_to_tun_v4,(unsigned char*)&ipv4_addr,sizeof(struct stream_tuple4_v4),kni_free_htable);
-		if(ret < 0)
-		{
-			kni_log_debug(RLOG_LV_FATAL,(char*)"MESA_htable_del",a_packet,"IPv4 MESA_htable_del() error,ret:%d",ret);
-			return -1;
-		}
-		else
-		{
-			kni_filestate2_set(pstream->threadnum,FS_HTABLE_DEL,0,1);
-		}
-	}
-	else
-	{
-		kni_get_ipaddr_v6((void*)a_packet,&ipv6_addr);
-		ret = MESA_htable_del(g_kni_structinfo.htable_to_tun_v6,(unsigned char*)&ipv6_addr,sizeof(struct stream_tuple4_v6),kni_free_htable);
-		if(ret < 0)
-		{
-			kni_log_debug(RLOG_LV_FATAL,(char*)"MESA_htable_del",a_packet,"IPv6 MESA_htable_del() error,ret:%d",ret);
-			return -1;
-		}
-		else
-		{
-			kni_filestate2_set(pstream->threadnum,FS_HTABLE_DEL,0,1);
-		}
 
-		
-	}
-
-	return 0;
-}
-*/
 
 int kni_htable_add(const struct streaminfo* pstream,const void* a_packet,struct kni_pme_info* pmeinfo)
 {	
 	int ret = 0;
 	int iprevers=0;
-//	struct stream_tuple4_v4 ipv4_addr;
-//	struct stream_tuple4_v6 ipv6_addr;
 	struct layer_addr_mac* mac_addr=(struct layer_addr_mac*)((char*)a_packet-KNI_ETHER_LEN);
 	struct kni_htable_datainfo* datainfo=ALLOC(struct kni_htable_datainfo, 1);
 
@@ -277,7 +234,6 @@ int kni_htable_add(const struct streaminfo* pstream,const void* a_packet,struct
 	}
 
 //send wnd_pro_reply info
-//	memcpy(&(datainfo->tcpopt_info),&(pmeinfo->tcpopt_info),KNI_DIR_DOUBLE*sizeof(struct kni_tcpopt_info));
 	memcpy(&(datainfo->lastpkt_info), &(pmeinfo->lastpkt_info), sizeof(datainfo->lastpkt_info));