ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-24 11:04:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Adam Ierymenko 2016-07-21 19:07:50 -07:00
commit faf864b8a2
10 changed files with 91 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
attic/OSXEthernetTap.cpp.pcap-with-bridge-test
View File

@ -43,7 +43,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>

1
attic/OSXEthernetTap.cpp.utun-work-in-progress
View File

@ -43,7 +43,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/sys_domain.h> #include <sys/sys_domain.h>

1
ext/libnatpmp/getgateway.c
View File

@ -96,7 +96,6 @@ POSSIBILITY OF SUCH DAMAGE.
#ifdef USE_SYSCTL_NET_ROUTE #ifdef USE_SYSCTL_NET_ROUTE
#include <stdlib.h> #include <stdlib.h>
#include <sys/sysctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <net/route.h> #include <net/route.h>
#endif #endif

6
java/jni/Application.mk
View File

@ -1,5 +1,5 @@
NDK_TOOLCHAIN_VERSION := clang # NDK_TOOLCHAIN_VERSION := clang3.5
APP_STL := c++_static APP_STL := gnustl_static
APP_CPPFLAGS := -O3 -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1 APP_CPPFLAGS := -O3 -fPIC -fPIE -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
APP_PLATFORM := android-14 APP_PLATFORM := android-14
APP_ABI := all APP_ABI := all

4
make-linux.mk
View File

@ -98,8 +98,8 @@ endif
ifeq ($(ZT_DEBUG),1) ifeq ($(ZT_DEBUG),1)
DEFS+=-DZT_TRACE DEFS+=-DZT_TRACE
override CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) override CFLAGS+=-Wall -g -O -pthread $(INCLUDES) $(DEFS)
override CXXFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) override CXXFLAGS+=-Wall -g -O -pthread $(INCLUDES) $(DEFS)
LDFLAGS= LDFLAGS=
STRIP?=echo STRIP?=echo
# The following line enables optimization for the crypto code, since # The following line enables optimization for the crypto code, since

2
node/IncomingPacket.cpp
View File

@ -42,9 +42,9 @@ namespace ZeroTier {
bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,bool deferred) bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,bool deferred)
{ {
try {
const Address sourceAddress(source()); const Address sourceAddress(source());
try {
// Check for trusted paths or unencrypted HELLOs (HELLO is the only packet sent in the clear) // Check for trusted paths or unencrypted HELLOs (HELLO is the only packet sent in the clear)
const unsigned int c = cipher(); const unsigned int c = cipher();
bool trusted = false; bool trusted = false;

1
osdep/BSDEthernetTap.cpp
View File

@ -34,7 +34,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>

1
osdep/ManagedRoute.cpp
View File

@ -33,7 +33,6 @@
#ifdef __UNIX_LIKE__ #ifdef __UNIX_LIKE__
#include <unistd.h> #include <unistd.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>

1
osdep/OSXEthernetTap.cpp
View File

@ -34,7 +34,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>