gfwleak/tango-kni
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改为更安全的初始化方式

Browse Source
This commit is contained in:
zhengchao
2018-12-01 15:34:55 +08:00
parent 37f32d59f0
commit b5f68ae7d5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kni_entry.c
View File

@@ -1046,12 +1046,12 @@ extern "C" char kni_ipv4_entry(const struct streaminfo *pstream,unsigned char ro
addr.addrtype = ADDR_TYPE_IPV4; addr.addrtype = ADDR_TYPE_IPV4;
addr.paddr = (void*)(&ipv4_addr); 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.daddr = *((unsigned int*)&(ipv4_hdr->ip_dst));
ipv4_addr.saddr = *((unsigned int*)&(ipv4_hdr->ip_src)); 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; pmeinfo.mid = mid;
kni_scan_ip(&addr,thread_seq,ipv4_hdr->ip_p,&pmeinfo); 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.addrtype = ADDR_TYPE_IPV6;
addr.paddr = (void*)(&ipv6_addr); 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.saddr=ipv6_hdr->ip6_src;
ipv6_addr.daddr=ipv6_hdr->ip6_dst; ipv6_addr.daddr=ipv6_hdr->ip6_dst;
memset(&pmeinfo,0,sizeof(struct kni_pme_info)); memset(&pmeinfo,0,sizeof(pmeinfo));
pmeinfo.mid = mid; pmeinfo.mid = mid;
kni_scan_ip(&addr,thread_seq,next_hdr_type,&pmeinfo); kni_scan_ip(&addr,thread_seq,next_hdr_type,&pmeinfo);

2
kni_intercept.c
View File

@@ -571,7 +571,7 @@ int kni_keepalive_replay(struct stream_tuple4_v4* ipv4_addr,int iprever_flag,str
{ {
return 0; return 0;
} }
assert(iprever_flag<2);
int index=1-iprever_flag; int index=1-iprever_flag;