From 19f09e46faaee6e2cfe52221e3e01946d31692f3 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Mon, 9 Nov 2015 19:37:19 -0800
Subject: [PATCH] Moved/Renamed Docker test dirs

---
 docker-test/._.DS_Store                          | Bin 0 -> 4096 bytes
 docker-test/{ => httpd_demo}/Dockerfile          |   0
 docker-test/{ => httpd_demo}/entrypoint.sh       |   0
 .../{ => httpd_demo}/htdocs/ZeroTierIcon.png     | Bin
 docker-test/{ => httpd_demo}/htdocs/index.html   |   0
 docker-test/{ => httpd_demo}/httpd.conf          |   0
 docker-test/{ => httpd_demo}/intercept           |   0
 .../{ => httpd_demo}/lib/libintercept.so.1.0     | Bin
 .../{throughput-test => throughput}/Dockerfile   |   0
 .../{throughput-test => throughput}/build.sh     |   0
 .../entrypoint.sh                                |   0
 .../generate_file.sh                             |   0
 .../{throughput-test => throughput}/intercept    |   0
 .../libintercept.so.1.0                          | Bin
 .../{throughput-test => throughput}/liblwip.so   | Bin
 .../{throughput-test => throughput}/zerotier-cli | Bin
 .../{throughput-test => throughput}/zerotier-one | Bin
 netcon/NetconEthernetTap.cpp                     |   6 +++---
 18 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 docker-test/._.DS_Store
 rename docker-test/{ => httpd_demo}/Dockerfile (100%)
 rename docker-test/{ => httpd_demo}/entrypoint.sh (100%)
 rename docker-test/{ => httpd_demo}/htdocs/ZeroTierIcon.png (100%)
 rename docker-test/{ => httpd_demo}/htdocs/index.html (100%)
 rename docker-test/{ => httpd_demo}/httpd.conf (100%)
 rename docker-test/{ => httpd_demo}/intercept (100%)
 rename docker-test/{ => httpd_demo}/lib/libintercept.so.1.0 (100%)
 rename docker-test/{throughput-test => throughput}/Dockerfile (100%)
 rename docker-test/{throughput-test => throughput}/build.sh (100%)
 rename docker-test/{throughput-test => throughput}/entrypoint.sh (100%)
 rename docker-test/{throughput-test => throughput}/generate_file.sh (100%)
 rename docker-test/{throughput-test => throughput}/intercept (100%)
 rename docker-test/{throughput-test => throughput}/libintercept.so.1.0 (100%)
 rename docker-test/{throughput-test => throughput}/liblwip.so (100%)
 rename docker-test/{throughput-test => throughput}/zerotier-cli (100%)
 rename docker-test/{throughput-test => throughput}/zerotier-one (100%)

diff --git a/docker-test/._.DS_Store b/docker-test/._.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c9f90aab2cda9b7bc2f8b7c7596909e6daed1afa
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIk*Y|peR=07!nc$
zl&FE|V5q>VXjE`C1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E1%90H6$^FSC3
z<U%qsixrAei}Op1l2aAZ@{6(+GV@AO^GY)F^AdA%Div~4(@GSQauV~hfn8mwt|3jK
N`XBBU83wuk{{eaS9TETl

literal 0
HcmV?d00001

diff --git a/docker-test/Dockerfile b/docker-test/httpd_demo/Dockerfile
similarity index 100%
rename from docker-test/Dockerfile
rename to docker-test/httpd_demo/Dockerfile
diff --git a/docker-test/entrypoint.sh b/docker-test/httpd_demo/entrypoint.sh
similarity index 100%
rename from docker-test/entrypoint.sh
rename to docker-test/httpd_demo/entrypoint.sh
diff --git a/docker-test/htdocs/ZeroTierIcon.png b/docker-test/httpd_demo/htdocs/ZeroTierIcon.png
similarity index 100%
rename from docker-test/htdocs/ZeroTierIcon.png
rename to docker-test/httpd_demo/htdocs/ZeroTierIcon.png
diff --git a/docker-test/htdocs/index.html b/docker-test/httpd_demo/htdocs/index.html
similarity index 100%
rename from docker-test/htdocs/index.html
rename to docker-test/httpd_demo/htdocs/index.html
diff --git a/docker-test/httpd.conf b/docker-test/httpd_demo/httpd.conf
similarity index 100%
rename from docker-test/httpd.conf
rename to docker-test/httpd_demo/httpd.conf
diff --git a/docker-test/intercept b/docker-test/httpd_demo/intercept
similarity index 100%
rename from docker-test/intercept
rename to 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
similarity index 100%
rename from docker-test/lib/libintercept.so.1.0
rename to docker-test/httpd_demo/lib/libintercept.so.1.0
diff --git a/docker-test/throughput-test/Dockerfile b/docker-test/throughput/Dockerfile
similarity index 100%
rename from docker-test/throughput-test/Dockerfile
rename to docker-test/throughput/Dockerfile
diff --git a/docker-test/throughput-test/build.sh b/docker-test/throughput/build.sh
similarity index 100%
rename from docker-test/throughput-test/build.sh
rename to docker-test/throughput/build.sh
diff --git a/docker-test/throughput-test/entrypoint.sh b/docker-test/throughput/entrypoint.sh
similarity index 100%
rename from docker-test/throughput-test/entrypoint.sh
rename to docker-test/throughput/entrypoint.sh
diff --git a/docker-test/throughput-test/generate_file.sh b/docker-test/throughput/generate_file.sh
similarity index 100%
rename from docker-test/throughput-test/generate_file.sh
rename to docker-test/throughput/generate_file.sh
diff --git a/docker-test/throughput-test/intercept b/docker-test/throughput/intercept
similarity index 100%
rename from docker-test/throughput-test/intercept
rename to docker-test/throughput/intercept
diff --git a/docker-test/throughput-test/libintercept.so.1.0 b/docker-test/throughput/libintercept.so.1.0
similarity index 100%
rename from docker-test/throughput-test/libintercept.so.1.0
rename to docker-test/throughput/libintercept.so.1.0
diff --git a/docker-test/throughput-test/liblwip.so b/docker-test/throughput/liblwip.so
similarity index 100%
rename from docker-test/throughput-test/liblwip.so
rename to docker-test/throughput/liblwip.so
diff --git a/docker-test/throughput-test/zerotier-cli b/docker-test/throughput/zerotier-cli
similarity index 100%
rename from docker-test/throughput-test/zerotier-cli
rename to docker-test/throughput/zerotier-cli
diff --git a/docker-test/throughput-test/zerotier-one b/docker-test/throughput/zerotier-one
similarity index 100%
rename from docker-test/throughput-test/zerotier-one
rename to docker-test/throughput/zerotier-one
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
index e17acbbff..b4e4eaaf2 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;