From dbaddd386db35646e770233377f13adf75307876 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Wed, 29 Jun 2016 13:11:11 -0700
Subject: [PATCH] lwip debug adjustments to makefiles

---
 make-liblwip.mk    | 9 ++++++---
 make-linux.mk      | 8 +++++++-
 tests/udp_client.c | 2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/make-liblwip.mk b/make-liblwip.mk
index a9d06d9..35685a1 100644
--- a/make-liblwip.mk
+++ b/make-liblwip.mk
@@ -39,8 +39,12 @@ LWIPDIR=ext/lwip/src
 
 CCDEP=gcc
 CC=gcc
-CFLAGS=-O3 -g -Wall -DIPv4 -fPIC 
-#-DLWIP_DEBUG
+CFLAGS=-O3 -g -Wall -DIPv4 -fPIC
+
+# Debug output for lwIP
+ifeq ($(SDK_LWIP_DEBUG),1)
+	CFLAGS+=-DLWIP_DEBUG
+endif
 
 CFLAGS:=$(CFLAGS) \
 	-I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
@@ -79,7 +83,6 @@ NETIFFILES+=$(LWIPDIR)/netif/ppp/auth.c $(LWIPDIR)/netif/ppp/chap.c \
 # ARCHFILES: Architecture specific files.
 ARCHFILES=$(wildcard $(LWIPARCH)/*.c $(LWIPARCH)tapif.c $(LWIPARCH)/netif/list.c $(LWIPARCH)/netif/tcpdump.c)
 
-
 # LWIPFILES: All the above.
 LWIPFILES=$(COREFILES) $(CORE4FILES) $(SNMPFILES) $(APIFILES) $(NETIFFILES) $(ARCHFILES)
 LWIPFILESW=$(wildcard $(LWIPFILES))
diff --git a/make-linux.mk b/make-linux.mk
index c7f08f9..35ac462 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -51,12 +51,18 @@ ifeq ($(ZT_TRACE),1)
 	DEFS+=-DZT_TRACE
 endif
 
+# Debug output for lwIP
+ifeq ($(SDK_LWIP_DEBUG),1)
+	LWIP_FLAGS:=SDK_LWIP_DEBUG=1
+endif
+
 # Debug output for the SDK
 # Specific levels can be controlled in src/SDK_Debug.h
 ifeq ($(SDK_DEBUG),1)
 	DEFS+=-DSDK_DEBUG -g
 endif
 
+
 all: shared_lib check
 
 remove_only_intermediates:
@@ -66,7 +72,7 @@ linux_shared_lib: remove_only_intermediates $(OBJS)
 	mkdir -p build/linux_shared_lib
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(DEFS) -DZT_SDK -DZT_ONE_NO_ROOT_CHECK -Iext/lwip/src/include -Iext/lwip/src/include/ipv4 -Iext/lwip/src/include/ipv6 -Izerotierone/osdep -Izerotierone/node -Isrc -o build/zerotier-sdk-service $(OBJS) zerotierone/service/OneService.cpp src/SDK_EthernetTap.cpp src/SDK_Proxy.cpp zerotierone/one.cpp -x c src/SDK_RPC.c $(LDLIBS) -ldl
 	# Build liblwip.so which must be placed in ZT home for zerotier-netcon-service to work
-	make -f make-liblwip.mk
+	make -f make-liblwip.mk $(LWIP_FLAGS)
 	# Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility
 	cd src ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -DVERBOSE -D_GNU_SOURCE -DSDK_INTERCEPT -I. -I../zerotierone/node -nostdlib -shared -o libztintercept.so SDK_Sockets.c SDK_Intercept.c SDK_Debug.c SDK_RPC.c -ldl
 	cp src/libztintercept.so build/linux_shared_lib/libztintercept.so
diff --git a/tests/udp_client.c b/tests/udp_client.c
index 8d03822..992fac5 100755
--- a/tests/udp_client.c
+++ b/tests/udp_client.c
@@ -41,7 +41,7 @@ int main(int argc, char * argv[])
         return 1;    
 	}
 
-    return 1;
+    //return 1;
 
     // Send multiple UDP datagrams to server
     char data[1024];