Moved/Renamed Docker test dirs

18 files changed, 3 insertions, 3 deletions

diff --git a/docker-test/._.DS_Store b/docker-test/._.DS_Store
new file mode 100644
index 00000000..c9f90aab
--- /dev/null
+++ b/docker-test/._.DS_Store
diff --git a/docker-test/Dockerfile b/docker-test/httpd_demo/Dockerfile
index a5de2140..a5de2140 100644
--- a/docker-test/Dockerfile
+++ b/docker-test/httpd_demo/Dockerfile
diff --git a/docker-test/entrypoint.sh b/docker-test/httpd_demo/entrypoint.sh
index 3e8845b4..3e8845b4 100644
--- a/docker-test/entrypoint.sh
+++ b/docker-test/httpd_demo/entrypoint.sh
diff --git a/docker-test/htdocs/ZeroTierIcon.png b/docker-test/httpd_demo/htdocs/ZeroTierIcon.png
index 4d9641b3..4d9641b3 100644
--- a/docker-test/htdocs/ZeroTierIcon.png
+++ b/docker-test/httpd_demo/htdocs/ZeroTierIcon.png
diff --git a/docker-test/htdocs/index.html b/docker-test/httpd_demo/htdocs/index.html
index 017e4493..017e4493 100644
--- a/docker-test/htdocs/index.html
+++ b/docker-test/httpd_demo/htdocs/index.html
diff --git a/docker-test/httpd.conf b/docker-test/httpd_demo/httpd.conf
index 5f6f7107..5f6f7107 100644
--- a/docker-test/httpd.conf
+++ b/docker-test/httpd_demo/httpd.conf
diff --git a/docker-test/intercept b/docker-test/httpd_demo/intercept
index 3eb27ff7..3eb27ff7 100755
--- a/docker-test/intercept
+++ b/docker-test/httpd_demo/intercept
diff --git a/docker-test/lib/libintercept.so.1.0 b/docker-test/httpd_demo/lib/libintercept.so.1.0
index 61826641..61826641 100755
--- a/docker-test/lib/libintercept.so.1.0
+++ b/docker-test/httpd_demo/lib/libintercept.so.1.0
diff --git a/docker-test/throughput-test/Dockerfile b/docker-test/throughput/Dockerfile
index 71549754..71549754 100644
--- a/docker-test/throughput-test/Dockerfile
+++ b/docker-test/throughput/Dockerfile
diff --git a/docker-test/throughput-test/build.sh b/docker-test/throughput/build.sh
index 586c8931..586c8931 100755
--- a/docker-test/throughput-test/build.sh
+++ b/docker-test/throughput/build.sh
diff --git a/docker-test/throughput-test/entrypoint.sh b/docker-test/throughput/entrypoint.sh
index 00fdd2be..00fdd2be 100644
--- a/docker-test/throughput-test/entrypoint.sh
+++ b/docker-test/throughput/entrypoint.sh
diff --git a/docker-test/throughput-test/generate_file.sh b/docker-test/throughput/generate_file.sh
index fd84de32..fd84de32 100644
--- a/docker-test/throughput-test/generate_file.sh
+++ b/docker-test/throughput/generate_file.sh
diff --git a/docker-test/throughput-test/intercept b/docker-test/throughput/intercept
index 3eb27ff7..3eb27ff7 100755
--- a/docker-test/throughput-test/intercept
+++ b/docker-test/throughput/intercept
diff --git a/docker-test/throughput-test/libintercept.so.1.0 b/docker-test/throughput/libintercept.so.1.0
index 7a451408..7a451408 100755
--- a/docker-test/throughput-test/libintercept.so.1.0
+++ b/docker-test/throughput/libintercept.so.1.0
diff --git a/docker-test/throughput-test/liblwip.so b/docker-test/throughput/liblwip.so
index 158169f1..158169f1 100755
--- a/docker-test/throughput-test/liblwip.so
+++ b/docker-test/throughput/liblwip.so
diff --git a/docker-test/throughput-test/zerotier-cli b/docker-test/throughput/zerotier-cli
index 020ee665..020ee665 100755
--- a/docker-test/throughput-test/zerotier-cli
+++ b/docker-test/throughput/zerotier-cli
diff --git a/docker-test/throughput-test/zerotier-one b/docker-test/throughput/zerotier-one
index 020ee665..020ee665 100755
--- a/docker-test/throughput-test/zerotier-one
+++ b/docker-test/throughput/zerotier-one
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
index e17acbbf..b4e4eaaf 100644
--- a/netcon/NetconEthernetTap.cpp
+++ b/netcon/NetconEthernetTap.cpp
@@ -928,12 +928,12 @@ err_t NetconEthernetTap::nc_poll(void* arg, struct tcp_pcb *tpcb)
  */
 err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len)
 {
-	dwr(5, " nc_sent()\n");
+	//dwr(5, " nc_sent()\n");
 	Larg *l = (Larg*)arg;
 	if(len) {
 		l->conn->acked+=len;
 		//dwr("W = %d, A = %d\n", l->conn->written, l->conn->acked);
-		dwr("ACK = %d\n", len);
+		//dwr("ACK = %d\n", len);
 		l->tap->_phy.setNotifyReadable(l->conn->dataSock, true);
 		l->tap->_phy.whack();
 	}
@@ -1356,7 +1356,7 @@ void NetconEthernetTap::handle_connect(PhySocket *sock, void **uptr, struct conn
 
 void NetconEthernetTap::handle_write(TcpConnection *conn)
 {
-	dwr(5, " handle_write()\n");
+	//dwr(5, " handle_write()\n");
 	float max = (float)TCP_SND_BUF;
 	int r;