Browse Source

Moved/Renamed Docker test dirs

Joseph Henry 9 years ago
parent
commit
19f09e46fa

BIN
docker-test/._.DS_Store


+ 0 - 0
docker-test/Dockerfile → docker-test/httpd_demo/Dockerfile


+ 0 - 0
docker-test/entrypoint.sh → docker-test/httpd_demo/entrypoint.sh


+ 0 - 0
docker-test/htdocs/ZeroTierIcon.png → docker-test/httpd_demo/htdocs/ZeroTierIcon.png


+ 0 - 0
docker-test/htdocs/index.html → docker-test/httpd_demo/htdocs/index.html


+ 0 - 0
docker-test/httpd.conf → docker-test/httpd_demo/httpd.conf


+ 0 - 0
docker-test/intercept → docker-test/httpd_demo/intercept


+ 0 - 0
docker-test/lib/libintercept.so.1.0 → docker-test/httpd_demo/lib/libintercept.so.1.0


+ 0 - 0
docker-test/throughput-test/Dockerfile → docker-test/throughput/Dockerfile


+ 0 - 0
docker-test/throughput-test/build.sh → docker-test/throughput/build.sh


+ 0 - 0
docker-test/throughput-test/entrypoint.sh → docker-test/throughput/entrypoint.sh


+ 0 - 0
docker-test/throughput-test/generate_file.sh → docker-test/throughput/generate_file.sh


+ 0 - 0
docker-test/throughput-test/intercept → docker-test/throughput/intercept


+ 0 - 0
docker-test/throughput-test/libintercept.so.1.0 → docker-test/throughput/libintercept.so.1.0


+ 0 - 0
docker-test/throughput-test/liblwip.so → docker-test/throughput/liblwip.so


+ 0 - 0
docker-test/throughput-test/zerotier-cli → docker-test/throughput/zerotier-cli


+ 0 - 0
docker-test/throughput-test/zerotier-one → docker-test/throughput/zerotier-one


+ 3 - 3
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;