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

minor address macro tweaks

Browse Source
This commit is contained in:
Joseph Henry
2016-10-28 03:10:35 -07:00
parent c7d81991cf
commit 5b777ad3f5
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/lwipopts.h
View File

@@ -46,10 +46,10 @@
// IPV6 Related // IPV6 Related
//#if defined(SDK_IPV6) //#if defined(SDK_IPV6)
#define LWIP_IPV6 0 #define LWIP_IPV6 1
//#endif //#endif
//#if defined(SDK_IPV4) //#if defined(SDK_IPV4)
#define LWIP_IPV4 1 #define LWIP_IPV4 0
//#endif //#endif
#define LWIP_TCP 1 #define LWIP_TCP 1

0
src/utils.hpp → src/sdkutils.hpp
View File

2
src/tap.cpp
View File

@@ -36,7 +36,7 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include "tap.hpp" #include "tap.hpp"
#include "utils.hpp" #include "sdkutils.hpp"
#include "sdk.h" #include "sdk.h"
#include "defs.h" #include "defs.h"
#include "debug.h" #include "debug.h"

3
src/tap.hpp
View File

@@ -497,10 +497,10 @@ namespace ZeroTier {
*/ */
void closeConnection(PhySocket *sock); void closeConnection(PhySocket *sock);
#if defined(SDK_PICOTCP)
ip_addr_t convert_ip(struct sockaddr_in * addr) ip_addr_t convert_ip(struct sockaddr_in * addr)
{ {
ip_addr_t conn_addr; ip_addr_t conn_addr;
struct sockaddr_in *ipv4 = addr; struct sockaddr_in *ipv4 = addr;
short a = ip4_addr1b(&(ipv4->sin_addr)); short a = ip4_addr1b(&(ipv4->sin_addr));
short b = ip4_addr2b(&(ipv4->sin_addr)); short b = ip4_addr2b(&(ipv4->sin_addr));
@@ -510,6 +510,7 @@ namespace ZeroTier {
return conn_addr; return conn_addr;
} }
#endif
Phy<NetconEthernetTap *> _phy; Phy<NetconEthernetTap *> _phy;
PhySocket *_unixListenSocket; PhySocket *_unixListenSocket;