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

IPV4 and IPV6 enabled by default in builds

Browse Source
This commit is contained in:
Joseph Henry
2017-06-14 13:44:45 -07:00
parent 1cedd7b568
commit 8a204c7755
6 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
make-bsd.mk
View File

@@ -127,13 +127,9 @@ ifeq ($(SDK_PICOTCP),1)
-I$(PICOTCP_DIR)/build/include \ -I$(PICOTCP_DIR)/build/include \
-Isrc/stack_drivers/picotcp -Isrc/stack_drivers/picotcp
endif endif
ifeq ($(SDK_IPV4),1)
CXXFLAGS+=-DSDK_IPV4
endif
ifeq ($(SDK_IPV6),1)
CXXFLAGS+=-DSDK_IPV6
endif
CXXFLAGS+=-DSDK_IPV4
CXXFLAGS+=-DSDK_IPV6
############################################################################## ##############################################################################
## Files ## ## Files ##

8
make-linux.mk
View File

@@ -127,13 +127,9 @@ ifeq ($(SDK_PICOTCP),1)
-I$(PICOTCP_DIR)/build/include \ -I$(PICOTCP_DIR)/build/include \
-Isrc/stack_drivers/picotcp -Isrc/stack_drivers/picotcp
endif endif
ifeq ($(SDK_IPV4),1)
CXXFLAGS+=-DSDK_IPV4
endif
ifeq ($(SDK_IPV6),1)
CXXFLAGS+=-DSDK_IPV6
endif
CXXFLAGS+=-DSDK_IPV4
CXXFLAGS+=-DSDK_IPV6
############################################################################## ##############################################################################
## Files ## ## Files ##

8
make-mac.mk
View File

@@ -126,13 +126,9 @@ ifeq ($(SDK_PICOTCP),1)
-I$(PICOTCP_DIR)/build/include \ -I$(PICOTCP_DIR)/build/include \
-Isrc/stack_drivers/picotcp -Isrc/stack_drivers/picotcp
endif endif
ifeq ($(SDK_IPV4),1)
CXXFLAGS+=-DSDK_IPV4
endif
ifeq ($(SDK_IPV6),1)
CXXFLAGS+=-DSDK_IPV6
endif
CXXFLAGS+=-DSDK_IPV4
CXXFLAGS+=-DSDK_IPV6
############################################################################## ##############################################################################
## Files ## ## Files ##

25
test/alice.conf
View File

@@ -1,14 +1,15 @@
nwid c7cd7c9e1b0f52a2 nwid e5cd7a9e1c0fd272
mode client mode server
test comprehensive
local_path zt1 local_path zt2
local_port 4545 local_port 4444
local_port6 4646 local_port6 5555
local_ipv4 10.9.9.50 local_ipv4 10.9.9.51
local_ipv6 fde5:cd7a:9edc:0f12:7399:98b2:5722:9143 local_ipv6 fde5:cd7a:9e1c:0fd2:7299:93e1:b555:8c83
remote_path zt2 remote_path zt1
remote_port 4545 remote_port 4444
remote_port6 4646 remote_port6 5555
remote_ipv4 10.9.9.51 remote_ipv4 10.9.9.50
remote_ipv6 fde5:cd72:9e17:0fdb:7e99:1369:4d5b:fe3f remote_ipv6 fde5:cd7a:9e1c:fd2:7299:93c4:fe0:4bb8

25
test/bob.conf
View File

@@ -1,14 +1,15 @@
nwid c7cd7c9e1b0f52a2 nwid e5cd7a9e1c0fd272
mode server mode client
test comprehensive
local_path zt2 local_path zt1
local_port 4545 local_port 4444
local_port6 4646 local_port6 5555
local_ipv4 10.9.9.51 local_ipv4 10.9.9.50
local_ipv6 fde5:cd72:9e17:0fdb:7e99:1369:4d5b:fe3f local_ipv6 fde5:cd7a:9e1c:fd2:7299:93c4:fe0:4bb8
remote_path zt1 remote_path zt2
remote_port 4545 remote_port 4444
remote_port6 4646 remote_port6 5555
remote_ipv4 10.9.9.50 remote_ipv4 10.9.9.51
remote_ipv6 fde5:cd7a:9edc:0f12:7399:98b2:5722:9143 remote_ipv6 fde5:cd7a:9e1c:0fd2:7299:93e1:b555:8c83

2
test/ztproxy.cpp
View File

@@ -134,7 +134,7 @@ namespace ZeroTier {
// If HOST was parsed correctly, establish remote connection // If HOST was parsed correctly, establish remote connection
if(host != "") if(host != "")
{ {
uint16_t dest_port, ipv;x uint16_t dest_port, ipv;
dest_port = _internal_port; dest_port = _internal_port;
// Save buffer to TcpConnection's write buffer, we'll forward // Save buffer to TcpConnection's write buffer, we'll forward