From b5f68ae7d53c81c3b0be40fdae8043edc045f8c2 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Sat, 1 Dec 2018 15:34:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=9B=B4=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kni_entry.c | 8 ++++---- kni_intercept.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kni_entry.c b/kni_entry.c index 8410a9e..aa9f31d 100644 --- a/kni_entry.c +++ b/kni_entry.c @@ -1046,12 +1046,12 @@ extern "C" char kni_ipv4_entry(const struct streaminfo *pstream,unsigned char ro addr.addrtype = ADDR_TYPE_IPV4; addr.paddr = (void*)(&ipv4_addr); - memset(&ipv4_addr,0,sizeof(struct tuple4)); + memset(&ipv4_addr,0,sizeof(ipv4_addr)); ipv4_addr.daddr = *((unsigned int*)&(ipv4_hdr->ip_dst)); ipv4_addr.saddr = *((unsigned int*)&(ipv4_hdr->ip_src)); - memset(&pmeinfo,0,sizeof(struct kni_pme_info)); + memset(&pmeinfo,0,sizeof(pmeinfo)); pmeinfo.mid = mid; kni_scan_ip(&addr,thread_seq,ipv4_hdr->ip_p,&pmeinfo); @@ -1095,11 +1095,11 @@ extern "C" char kni_ipv6_entry(const struct streaminfo *pstream,unsigned char ro addr.addrtype = ADDR_TYPE_IPV6; addr.paddr = (void*)(&ipv6_addr); - memset(&ipv6_addr,0,sizeof(struct tuple6)); + memset(&ipv6_addr,0,sizeof(ipv6_addr)); ipv6_addr.saddr=ipv6_hdr->ip6_src; ipv6_addr.daddr=ipv6_hdr->ip6_dst; - memset(&pmeinfo,0,sizeof(struct kni_pme_info)); + memset(&pmeinfo,0,sizeof(pmeinfo)); pmeinfo.mid = mid; kni_scan_ip(&addr,thread_seq,next_hdr_type,&pmeinfo); diff --git a/kni_intercept.c b/kni_intercept.c index 18a7094..2553775 100644 --- a/kni_intercept.c +++ b/kni_intercept.c @@ -571,7 +571,7 @@ int kni_keepalive_replay(struct stream_tuple4_v4* ipv4_addr,int iprever_flag,str { return 0; } - + assert(iprever_flag<2); int index=1-iprever_flag;