summaryrefslogtreecommitdiff
path: root/netcon
diff options
context:
space:
mode:
authorJoseph Henry <joseph.henry@zerotier.com>2015-10-09 17:31:22 -0400
committerJoseph Henry <joseph.henry@zerotier.com>2015-10-09 17:31:22 -0400
commit3bcb6bf321d0f218b5326312e6ee4341cacdf574 (patch)
treee8324a29b6e9fb46d0840f537c9939e909c7131e /netcon
parent7f56678d844eaa6ae1d0f061caba6518eb659c3d (diff)
downloadinfinitytier-3bcb6bf321d0f218b5326312e6ee4341cacdf574.tar.gz
infinitytier-3bcb6bf321d0f218b5326312e6ee4341cacdf574.zip
Minor cleanup
Diffstat (limited to 'netcon')
-rw-r--r--netcon/.depend412
-rw-r--r--netcon/NetconEthernetTap.cpp3
-rw-r--r--netcon/NetconEthernetTap.hpp1
-rw-r--r--netcon/NetconUtilities.cpp21
-rw-r--r--netcon/defs.h60
-rwxr-xr-xnetcon/intercept.c15
-rwxr-xr-xnetcon/libintercept.so.1.0bin0 -> 51144 bytes
-rwxr-xr-xnetcon/liblwip.sobin0 -> 342016 bytes
-rw-r--r--netcon/make-intercept.mk28
9 files changed, 443 insertions, 97 deletions
diff --git a/netcon/.depend b/netcon/.depend
new file mode 100644
index 00000000..3c8a1d97
--- /dev/null
+++ b/netcon/.depend
@@ -0,0 +1,412 @@
+mem.o: ../ext/lwip/src/core/mem.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+memp.o: ../ext/lwip/src/core/memp.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/lwip/pbuf.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/lwip/udp.h ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/def.h ../ext/lwip/src/include/lwip/ip.h \
+ ../ext/lwip/src/include/lwip/raw.h \
+ ../ext/lwip/src/include/lwip/tcp_impl.h \
+ ../ext/lwip/src/include/lwip/tcp.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h \
+ ../ext/lwip/src/include/ipv4/lwip/igmp.h \
+ ../ext/lwip/src/include/lwip/api.h \
+ ../ext/lwip/src/include/lwip/api_msg.h \
+ ../ext/lwip/src/include/lwip/tcpip.h ../ext/lwip/src/include/lwip/sys.h \
+ ../ext/lwip/src/include/lwip/timers.h \
+ ../ext/lwip/src/include/lwip/stats.h \
+ ../ext/lwip/src/include/netif/etharp.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_frag.h \
+ ../ext/lwip/src/include/lwip/snmp_structs.h \
+ ../ext/lwip/src/include/lwip/snmp_msg.h \
+ ../ext/lwip/src/include/lwip/snmp.h ../ext/lwip/src/include/lwip/dns.h \
+ ../ext/lwip/src/include/netif/ppp_oe.h
+netif.o: ../ext/lwip/src/core/netif.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/def.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/netif.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/lwip/pbuf.h \
+ ../ext/lwip/src/include/lwip/tcp_impl.h \
+ ../ext/lwip/src/include/lwip/tcp.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/lwip/ip.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h \
+ ../ext/lwip/src/include/lwip/snmp.h \
+ ../ext/lwip/src/include/ipv4/lwip/igmp.h \
+ ../ext/lwip/src/include/netif/etharp.h \
+ ../ext/lwip/src/include/lwip/stats.h ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h
+pbuf.o: ../ext/lwip/src/core/pbuf.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/stats.h \
+ ../ext/lwip/src/include/lwip/mem.h ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/lwip/def.h ../ext/lwip/src/include/lwip/pbuf.h \
+ ../ext/lwip/src/include/lwip/err.h ../ext/lwip/src/include/lwip/sys.h \
+ ../ext/lwip/src/include/arch/perf.h \
+ ../ext/lwip/src/include/lwip/tcp_impl.h \
+ ../ext/lwip/src/include/lwip/tcp.h ../ext/lwip/src/include/lwip/ip.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h
+raw.o: ../ext/lwip/src/core/raw.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/def.h \
+ ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/netif.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/lwip/pbuf.h ../ext/lwip/src/include/lwip/raw.h \
+ ../ext/lwip/src/include/lwip/ip.h ../ext/lwip/src/include/lwip/stats.h \
+ ../ext/lwip/src/include/lwip/mem.h ../ext/lwip/src/include/arch/perf.h
+stats.o: ../ext/lwip/src/core/stats.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/def.h \
+ ../ext/lwip/src/include/lwip/stats.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h
+sys.o: ../ext/lwip/src/core/sys.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/sys.h
+tcp.o: ../ext/lwip/src/core/tcp.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/def.h \
+ ../ext/lwip/src/include/lwip/mem.h ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/lwip/snmp.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/tcp.h ../ext/lwip/src/include/lwip/pbuf.h \
+ ../ext/lwip/src/include/lwip/err.h ../ext/lwip/src/include/lwip/ip.h \
+ ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h \
+ ../ext/lwip/src/include/lwip/tcp_impl.h \
+ ../ext/lwip/src/include/lwip/stats.h
+tcp_in.o: ../ext/lwip/src/core/tcp_in.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h \
+ ../ext/lwip/src/include/lwip/tcp_impl.h \
+ ../ext/lwip/src/include/lwip/tcp.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/lwip/pbuf.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/lwip/ip.h ../ext/lwip/src/include/lwip/def.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h \
+ ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/ipv4/lwip/inet_chksum.h \
+ ../ext/lwip/src/include/lwip/stats.h ../ext/lwip/src/include/lwip/snmp.h \
+ ../ext/lwip/src/include/arch/perf.h
+tcp_out.o: ../ext/lwip/src/core/tcp_out.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h \
+ ../ext/lwip/src/include/lwip/tcp_impl.h \
+ ../ext/lwip/src/include/lwip/tcp.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/lwip/pbuf.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/lwip/ip.h ../ext/lwip/src/include/lwip/def.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h \
+ ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/ipv4/lwip/inet_chksum.h \
+ ../ext/lwip/src/include/lwip/stats.h ../ext/lwip/src/include/lwip/snmp.h
+udp.o: ../ext/lwip/src/core/udp.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/udp.h \
+ ../ext/lwip/src/include/lwip/pbuf.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/def.h ../ext/lwip/src/include/lwip/ip.h \
+ ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/ipv4/lwip/inet_chksum.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h \
+ ../ext/lwip/src/include/lwip/stats.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/lwip/snmp.h ../ext/lwip/src/include/arch/perf.h \
+ ../ext/lwip/src/include/lwip/dhcp.h
+dhcp.o: ../ext/lwip/src/core/dhcp.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+init.o: ../ext/lwip/src/core/init.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/init.h \
+ ../ext/lwip/src/include/lwip/stats.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/lwip/sys.h ../ext/lwip/src/include/lwip/pbuf.h \
+ ../ext/lwip/src/include/lwip/err.h ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/def.h \
+ ../ext/lwip/src/include/lwip/sockets.h ../ext/lwip/src/include/lwip/ip.h \
+ ../ext/lwip/src/include/lwip/raw.h ../ext/lwip/src/include/lwip/udp.h \
+ ../ext/lwip/src/include/lwip/tcp_impl.h \
+ ../ext/lwip/src/include/lwip/tcp.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h \
+ ../ext/lwip/src/include/lwip/snmp_msg.h \
+ ../ext/lwip/src/include/lwip/snmp.h \
+ ../ext/lwip/src/include/lwip/snmp_structs.h \
+ ../ext/lwip/src/include/ipv4/lwip/autoip.h \
+ ../ext/lwip/src/include/ipv4/lwip/igmp.h \
+ ../ext/lwip/src/include/lwip/dns.h ../ext/lwip/src/include/lwip/timers.h \
+ ../ext/lwip/src/include/netif/etharp.h \
+ ../ext/lwip/src/include/lwip/api.h
+timers.o: ../ext/lwip/src/core/timers.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/timers.h \
+ ../ext/lwip/src/include/lwip/tcp_impl.h \
+ ../ext/lwip/src/include/lwip/tcp.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/lwip/pbuf.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/lwip/ip.h ../ext/lwip/src/include/lwip/def.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h
+def.o: ../ext/lwip/src/core/def.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/def.h
+ip_frag.o: ../ext/lwip/src/core/ipv4/ip_frag.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_frag.h \
+ ../ext/lwip/src/include/lwip/err.h ../ext/lwip/src/include/lwip/pbuf.h \
+ ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/def.h ../ext/lwip/src/include/lwip/ip.h \
+ ../ext/lwip/src/include/ipv4/lwip/inet_chksum.h \
+ ../ext/lwip/src/include/lwip/snmp.h ../ext/lwip/src/include/lwip/stats.h \
+ ../ext/lwip/src/include/lwip/mem.h ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h
+inet.o: ../ext/lwip/src/core/ipv4/inet.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h \
+ ../ext/lwip/src/include/ipv4/lwip/inet.h \
+ ../ext/lwip/src/include/lwip/def.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h
+ip_addr.o: ../ext/lwip/src/core/ipv4/ip_addr.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/def.h ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/lwip/err.h ../ext/lwip/src/include/lwip/pbuf.h
+igmp.o: ../ext/lwip/src/core/ipv4/igmp.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+ip.o: ../ext/lwip/src/core/ipv4/ip.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/ip.h \
+ ../ext/lwip/src/include/lwip/def.h ../ext/lwip/src/include/lwip/pbuf.h \
+ ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/netif.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_frag.h \
+ ../ext/lwip/src/include/ipv4/lwip/inet_chksum.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h \
+ ../ext/lwip/src/include/ipv4/lwip/igmp.h \
+ ../ext/lwip/src/include/lwip/raw.h ../ext/lwip/src/include/lwip/udp.h \
+ ../ext/lwip/src/include/lwip/tcp_impl.h \
+ ../ext/lwip/src/include/lwip/tcp.h ../ext/lwip/src/include/lwip/snmp.h \
+ ../ext/lwip/src/include/lwip/dhcp.h \
+ ../ext/lwip/src/include/ipv4/lwip/autoip.h \
+ ../ext/lwip/src/include/lwip/stats.h ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/arch/perf.h
+autoip.o: ../ext/lwip/src/core/ipv4/autoip.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+inet_chksum.o: ../ext/lwip/src/core/ipv4/inet_chksum.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h \
+ ../ext/lwip/src/include/ipv4/lwip/inet_chksum.h \
+ ../ext/lwip/src/include/lwip/pbuf.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/def.h
+icmp.o: ../ext/lwip/src/core/ipv4/icmp.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h \
+ ../ext/lwip/src/include/ipv4/lwip/icmp.h \
+ ../ext/lwip/src/include/lwip/pbuf.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/def.h ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/ipv4/lwip/inet_chksum.h \
+ ../ext/lwip/src/include/lwip/ip.h ../ext/lwip/src/include/lwip/stats.h \
+ ../ext/lwip/src/include/lwip/mem.h ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/lwip/snmp.h
+asn1_dec.o: ../ext/lwip/src/core/snmp/asn1_dec.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+asn1_enc.o: ../ext/lwip/src/core/snmp/asn1_enc.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+mib2.o: ../ext/lwip/src/core/snmp/mib2.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+mib_structs.o: ../ext/lwip/src/core/snmp/mib_structs.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+msg_in.o: ../ext/lwip/src/core/snmp/msg_in.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+msg_out.o: ../ext/lwip/src/core/snmp/msg_out.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+api_lib.o: ../ext/lwip/src/api/api_lib.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+api_msg.o: ../ext/lwip/src/api/api_msg.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+tcpip.o: ../ext/lwip/src/api/tcpip.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+err.o: ../ext/lwip/src/api/err.c ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+sockets.o: ../ext/lwip/src/api/sockets.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+netbuf.o: ../ext/lwip/src/api/netbuf.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+netdb.o: ../ext/lwip/src/api/netdb.c ../ext/lwip/src/include/lwip/netdb.h \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+etharp.o: ../ext/lwip/src/netif/etharp.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/def.h ../ext/lwip/src/include/lwip/ip.h \
+ ../ext/lwip/src/include/lwip/pbuf.h ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/lwip/stats.h ../ext/lwip/src/include/lwip/mem.h \
+ ../ext/lwip/src/include/lwip/memp.h \
+ ../ext/lwip/src/include/lwip/memp_std.h \
+ ../ext/lwip/src/include/lwip/snmp.h ../ext/lwip/src/include/lwip/dhcp.h \
+ ../ext/lwip/src/include/ipv4/lwip/autoip.h \
+ ../ext/lwip/src/include/netif/etharp.h
+slipif.o: ../ext/lwip/src/netif/slipif.c \
+ ../ext/lwip/src/include/netif/slipif.h \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h ../ext/lwip/src/include/lwip/netif.h \
+ ../ext/lwip/src/include/lwip/err.h \
+ ../ext/lwip/src/include/ipv4/lwip/ip_addr.h \
+ ../ext/lwip/src/include/lwip/def.h ../ext/lwip/src/include/lwip/pbuf.h
+auth.o: ../ext/lwip/src/netif/ppp/auth.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+chap.o: ../ext/lwip/src/netif/ppp/chap.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+chpms.o: ../ext/lwip/src/netif/ppp/chpms.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+fsm.o: ../ext/lwip/src/netif/ppp/fsm.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+ipcp.o: ../ext/lwip/src/netif/ppp/ipcp.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+lcp.o: ../ext/lwip/src/netif/ppp/lcp.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+magic.o: ../ext/lwip/src/netif/ppp/magic.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+md5.o: ../ext/lwip/src/netif/ppp/md5.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+pap.o: ../ext/lwip/src/netif/ppp/pap.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+ppp.o: ../ext/lwip/src/netif/ppp/ppp.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+randm.o: ../ext/lwip/src/netif/ppp/randm.c \
+ ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
+vj.o: ../ext/lwip/src/netif/ppp/vj.c ../ext/lwip/src/include/lwip/opt.h \
+ ../ext/lwip/src/include/../../../lwipopts.h \
+ ../ext/lwip/src/include/lwip/debug.h ../ext/lwip/src/include/lwip/arch.h \
+ ../ext/lwip/src/include/arch/cc.h
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
index 79ddb238..44d29a73 100644
--- a/netcon/NetconEthernetTap.cpp
+++ b/netcon/NetconEthernetTap.cpp
@@ -30,7 +30,6 @@
#include <algorithm>
#include <utility>
#include <dlfcn.h>
-//#include <sys/types.h>
#include "NetconEthernetTap.hpp"
@@ -634,7 +633,7 @@ err_t NetconEthernetTap::nc_poll(void* arg, struct tcp_pcb *tpcb)
NetconEthernetTap *tap = l->tap;
if(conn && conn->idx) // if valid connection and non-zero index (indicating data present)
tap->handle_write(conn);
-
+
return ERR_OK;
}
diff --git a/netcon/NetconEthernetTap.hpp b/netcon/NetconEthernetTap.hpp
index 45e6b790..69acf833 100644
--- a/netcon/NetconEthernetTap.hpp
+++ b/netcon/NetconEthernetTap.hpp
@@ -142,7 +142,6 @@ private:
TcpConnection *getConnectionByPCB(struct tcp_pcb *pcb);
void closeConnection(TcpConnection *conn);
void closeAll();
-
void closeClient(PhySocket *sock);
Phy<NetconEthernetTap *> _phy;
diff --git a/netcon/NetconUtilities.cpp b/netcon/NetconUtilities.cpp
index 584c4944..fdfef369 100644
--- a/netcon/NetconUtilities.cpp
+++ b/netcon/NetconUtilities.cpp
@@ -41,27 +41,6 @@
namespace ZeroTier
{
- /*
- ip_addr_t convert_ip(struct sockaddr_in * addr)
- {
- ip_addr_t conn_addr;
- struct sockaddr_in *ipv4 = addr;
- short a = ip4_addr1(&(ipv4->sin_addr));
- short b = ip4_addr2(&(ipv4->sin_addr));
- short c = ip4_addr3(&(ipv4->sin_addr));
- short d = ip4_addr4(&(ipv4->sin_addr));
- IP4_ADDR(&conn_addr, a,b,c,d);
- return conn_addr;
- }
-*/
-
-/*
- ip_addr_t ip_addr_sin(register struct sockaddr_in *sin) {
- ip_addr_t ip;
- *((struct sockaddr_in*) &ip) = *sin;
- return ip;
- }
-*/
// Functions used to pass file descriptors between processes
ssize_t sock_fd_write(int sock, int fd)
diff --git a/netcon/defs.h b/netcon/defs.h
deleted file mode 100644
index 455f166f..00000000
--- a/netcon/defs.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2015 ZeroTier, Inc.
- *
- * 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/>.
- *
- * --
- *
- * ZeroTier may be used and distributed under the terms of the GPLv3, which
- * are available at: http://www.gnu.org/licenses/gpl-3.0.html
- *
- * If you would like to embed ZeroTier into a commercial application or
- * redistribute it in a modified binary form, please contact ZeroTier Networks
- * LLC. Start here: http://www.zerotier.com/
- */
-
-
-/* Maximum number of socket connections allowed in service */
-#define MAX_SOCKETS 1024
-/* Maximum number of harnesses allowed to be connected to this service */
-#define MAX_INTERCEPTS 256
-
-#define SELECT_PERF_WARNING 1000
-
-#define CMD_SIZE 32
-#define DATA_IDX CMD_SIZE
-#define CMD_IDX 0
-#define BUF_SZ 1024
-
-/* number or times an intercept will attempt to connect to the service */
-#define SERVICE_CONNECT_ATTEMPTS 3
-
-/* how long we wait when polling various I/O sources in the core I/O loop */
-#define INTERCEPT_POLL_TIMEOUT 0
-
-/* how often we want lwIP to poll our callback.
- - We use this to resume pending data transfers */
-#define APPLICATION_POLL_FREQ 1
-
-/* for passing applications as arguments to the service */
-#define APP_ARGUMENT_LENGTH 128
-
-
-#define DEFAULT_RPC_PIPE_IDX 0
-
-/* display various types of detectable lwip/service/intercept problems */
-#define NETCON_WARNINGS 1
-
-typedef int rpc_len_type;
diff --git a/netcon/intercept.c b/netcon/intercept.c
index cd321044..b7bd097b 100755
--- a/netcon/intercept.c
+++ b/netcon/intercept.c
@@ -71,7 +71,6 @@ char *progname = "";
#include "intercept.h"
#include "common.h"
-#include "defs.h"
/* Global Declarations */
#ifdef USE_SOCKS_DNS
@@ -119,6 +118,9 @@ it conflicts with our overriden symbols for read/write */
#define STDOUT_FILENO 1
#define STDERR_FILENO 2
+#define BUF_SZ 1024
+#define SERVICE_CONNECT_ATTEMPTS 30
+
ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd);
/* threading */
@@ -133,12 +135,7 @@ pthread_mutex_t loglock;
static int is_initialized = 0;
static int fdret_sock; // used for fd-transfers
static int newfd; // used for "this_end" socket
-
static char* af_sock_name = "/tmp/.ztnc_e5cd7a9e1c5311ab";
-static char* logfilename = "intercept.log";
-FILE *logfile = NULL;
-static char* logmode = "a";
-static int flog = -1;
static int thispid;
@@ -208,8 +205,6 @@ void my_dest(void) {
dwr("closing connections to service...\n");
close(fdret_sock);
pthread_mutex_destroy(&lock);
- //close(flog);
- //close(logfile);
}
@@ -218,9 +213,7 @@ void load_symbols(void)
#ifdef USE_OLD_DLSYM
void *lib;
#endif
-
/* possibly add check to beginning of each method to avoid needing to cll the constructor */
-
if(thispid == getpid()) {
dwr("detected duplicate call to global ctor (pid=%d).\n", thispid);
}
@@ -722,8 +715,6 @@ int accept(ACCEPT_SIG)
int sock_type = -1;
socklen_t sock_type_len = sizeof(sock_type);
- struct sockaddr_in *connaddr;
- connaddr = (struct sockaddr_in *) addr;
getsockopt(sockfd, SOL_SOCKET, SO_TYPE,
(void *) &sock_type, &sock_type_len);
diff --git a/netcon/libintercept.so.1.0 b/netcon/libintercept.so.1.0
new file mode 100755
index 00000000..43b000de
--- /dev/null
+++ b/netcon/libintercept.so.1.0
Binary files differ
diff --git a/netcon/liblwip.so b/netcon/liblwip.so
new file mode 100755
index 00000000..c315404a
--- /dev/null
+++ b/netcon/liblwip.so
Binary files differ
diff --git a/netcon/make-intercept.mk b/netcon/make-intercept.mk
index 071fdda9..596999e0 100644
--- a/netcon/make-intercept.mk
+++ b/netcon/make-intercept.mk
@@ -1,6 +1,32 @@
+#
+# ZeroTier One - Network Virtualization Everywhere
+# Copyright (C) 2011-2015 ZeroTier, Inc.
+#
+# 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/>.
+#
+# --
+#
+# ZeroTier may be used and distributed under the terms of the GPLv3, which
+# are available at: http://www.gnu.org/licenses/gpl-3.0.html
+#
+# If you would like to embed ZeroTier into a commercial application or
+# redistribute it in a modified binary form, please contact ZeroTier Networks
+# LLC. Start here: http://www.zerotier.com/
+#
+
SHCC=gcc
-# intercept-specific
intercept_CFLAGS = -c -fPIC -g -O2 -Wall -std=c99 -D_GNU_SOURCE -DNETCON_INTERCEPT
LIB_NAME = intercept
SHLIB_EXT=dylib