亦庄编译通过版本

This commit is contained in:
liuyang
2018-12-01 17:51:39 +08:00
parent b5f68ae7d5
commit af3e60d3e1
5 changed files with 48 additions and 12 deletions

View File

@@ -1,6 +1,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
@@ -1096,8 +1097,11 @@ extern "C" char kni_ipv6_entry(const struct streaminfo *pstream,unsigned char ro
addr.paddr = (void*)(&ipv6_addr);
memset(&ipv6_addr,0,sizeof(ipv6_addr));
ipv6_addr.saddr=ipv6_hdr->ip6_src;
ipv6_addr.daddr=ipv6_hdr->ip6_dst;
memcpy(ipv6_addr.saddr,&(ipv6_hdr->ip6_src),sizeof(ipv6_addr.saddr));
memcpy(ipv6_addr.daddr,&(ipv6_hdr->ip6_dst),sizeof(ipv6_addr.saddr));
// ipv6_addr.saddr=ipv6_hdr->ip6_src.s6_addr32;
// ipv6_addr.daddr=ipv6_hdr->ip6_dst.s6_addr32;
memset(&pmeinfo,0,sizeof(pmeinfo));
pmeinfo.mid = mid;
@@ -1528,7 +1532,6 @@ extern "C" char kni_init()
pthread_t pid_kni_filestat2;
g_kni_comminfo.tun_threadnum = g_iThreadNum;
// g_kni_comminfo.tun_threadnum = 5;
init_profile_info();