diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2018-05-24 15:22:11 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-05-24 15:22:11 -0700 |
| commit | c24d16e62eb6db70ff8aa8777156a938d1b7b2c0 (patch) | |
| tree | ed1d3805867c4b1aba616a813c48e49687eaf595 /make-linux.mk | |
| parent | c0efba79c70ee537813efd333302dc588668cbce (diff) | |
| download | infinitytier-c24d16e62eb6db70ff8aa8777156a938d1b7b2c0.tar.gz infinitytier-c24d16e62eb6db70ff8aa8777156a938d1b7b2c0.zip | |
ManagedRoute uses ioctl to add/remove routes on Linux
Added LinuxNetLink to talk to the rtnetlink socket for adding interfaces, addresses routes. Not yet complete. Can currently monitor changes on the system.
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/make-linux.mk b/make-linux.mk index 56096da8..69dc5619 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -17,6 +17,10 @@ DESTDIR?= include objects.mk ONE_OBJS+=osdep/LinuxEthernetTap.o +ONE_OBJS+=osdep/LinuxNetLink.o + +NLTEST_OBJS+=osdep/LinuxNetLink.o +NLTEST_OBJS+=nltest.o # Auto-detect miniupnpc and nat-pmp as well and use system libs if present, # otherwise build into binary as done on Mac and Windows. @@ -55,8 +59,8 @@ ifeq ($(ZT_SANITIZE),1) SANFLAGS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1 endif ifeq ($(ZT_DEBUG),1) - override CFLAGS+=-Wall -Wno-deprecated -Werror -g -pthread $(INCLUDES) $(DEFS) - override CXXFLAGS+=-Wall -Wno-deprecated -Werror -g -std=c++11 -pthread $(INCLUDES) $(DEFS) + override CFLAGS+=-Wall -Wno-deprecated -g -pthread $(INCLUDES) $(DEFS) + override CXXFLAGS+=-Wall -Wno-deprecated -g -std=c++11 -pthread $(INCLUDES) $(DEFS) ZT_TRACE=1 STRIP?=echo # The following line enables optimization for the crypto code, since @@ -307,6 +311,9 @@ debug: FORCE make ZT_DEBUG=1 one make ZT_DEBUG=1 selftest +nltest: $(NLTEST_OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o nltest $(NLTEST_OBJS) $(LDLIBS) + # Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these # provide backward compatibility with old releases where the binaries actually # lived here. Folks got scripts. |