Updated makefiles, locations of sample apps

examples/cathode/README.md

@@ -0,0 +1,3 @@
+## Encrypted P2P chat in the terminal.
+
+See: [https://github.com/zerotier/cathode](https://github.com/zerotier/cathode)

examples/intercept/intercept.cpp

@@ -0,0 +1,56 @@
+/*
+ * ZeroTier SDK - Network Virtualization Everywhere
+ * Copyright (C) 2011-2017  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * You can be released from the requirements of the license by purchasing
+ * a commercial license. Buying such a license is mandatory as soon as you
+ * develop commercial closed-source software that incorporates or links
+ * directly against ZeroTier software without disclosing the source code
+ * of your own application.
+ */
+
+#include "libzt.h"
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <string.h>
+
+#include <stdio.h>
+#include <dlfcn.h>
+
+int (*realsocket)(ZT_SOCKET_SIG) = 0;
+
+extern void load_symbols()
+{
+    DEBUG_INFO();
+    realsocket = (int(*)(ZT_SOCKET_SIG))dlsym(RTLD_NEXT, "socket");
+}
+
+int socket(ZT_SOCKET_SIG)
+{   
+	DEBUG_INFO();
+	return zts_socket(socket_family, socket_type, protocol);
+}
+
+int main()
+{
+	return 0;
+}

make-bsd.mk

@@ -156,8 +156,6 @@ PICO_OBJS+= ext/picotcp/build/lib/pico_device.o \
 
 all: 
 
-tests: unit_tests
-
 ##############################################################################
 ## User-Space Stack                                                         ##
 ##############################################################################
@@ -195,8 +193,16 @@ $(TEST_BUILD_DIR)/%: $(UNIT_TEST_SRC_DIR)/%.cpp
 	@-$(CXX) $(UNIT_TEST_INCLUDES) -o $@ $< $(UNIT_TEST_LIBS)
 	@-./check.sh $@
 
-unit_tests: $(UNIT_TEST_OBJ_FILES)
+tests: $(UNIT_TEST_OBJ_FILES)
 
+intercept:
+	@$(CXX) $(CXXFLAGS) $(UNIT_TEST_INCLUDES) examples/intercept/intercept.cpp -D_GNU_SOURCE -shared -o $(BUILD)/intercept.so $< $(UNIT_TEST_LIBS) -ldl
+	@./check.sh $(BUILD)/intercept.so
+
+ztproxy:
+	@$(CXX) $(CXXFLAGS) $(UNIT_TEST_INCLUDES) examples/ztproxy/ztproxy.cpp -o $(BUILD)/ztproxy $< $(UNIT_TEST_LIBS) -ldl
+	@./check.sh $(BUILD)/ztproxy
+	
 ##############################################################################
 ## Misc                                                                     ##
 ##############################################################################

make-linux.mk

@@ -252,6 +252,14 @@ $(TEST_BUILD_DIR)/%: $(UNIT_TEST_SRC_DIR)/%.cpp
 
 tests: $(UNIT_TEST_OBJ_FILES)
 
+intercept:
+	@$(CXX) $(CXXFLAGS) $(UNIT_TEST_INCLUDES) examples/intercept/intercept.cpp -D_GNU_SOURCE -shared -o $(BUILD)/intercept.so $< $(UNIT_TEST_LIBS) -ldl
+	@./check.sh $(BUILD)/intercept.so
+
+ztproxy:
+	@$(CXX) $(CXXFLAGS) $(UNIT_TEST_INCLUDES) examples/ztproxy/ztproxy.cpp -o $(BUILD)/ztproxy $< $(UNIT_TEST_LIBS) -ldl
+	@./check.sh $(BUILD)/ztproxy
+	
 ##############################################################################
 ## Misc                                                                     ##
 ##############################################################################

make-mac.mk

@@ -263,6 +263,14 @@ $(TEST_BUILD_DIR)/%: $(UNIT_TEST_SRC_DIR)/%.cpp
 
 tests: $(UNIT_TEST_OBJ_FILES)
 
+intercept:
+	@$(CXX) $(CXXFLAGS) $(UNIT_TEST_INCLUDES) examples/intercept/intercept.cpp -D_GNU_SOURCE -shared -o $(BUILD)/intercept.so $< $(UNIT_TEST_LIBS) -ldl
+	@./check.sh $(BUILD)/intercept.so
+
+ztproxy:
+	@$(CXX) $(CXXFLAGS) $(UNIT_TEST_INCLUDES) examples/ztproxy/ztproxy.cpp -o $(BUILD)/ztproxy $< $(UNIT_TEST_LIBS) -ldl
+	@./check.sh $(BUILD)/ztproxy
+
 ##############################################################################
 ## Misc                                                                     ##
 ##############################################################################