From df391c84133e1af2945d1a484fe64420cc668fa2 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 3 Nov 2015 10:30:18 -0800 Subject: Added debug statements for transfer test --- netcon/NetconEthernetTap.cpp | 3 +++ netcon/NetconService.hpp | 5 ++++- netcon/liblwip.so | Bin 0 -> 342016 bytes 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 netcon/liblwip.so (limited to 'netcon') diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp index 7652eaf9..b6d7e2ce 100644 --- a/netcon/NetconEthernetTap.cpp +++ b/netcon/NetconEthernetTap.cpp @@ -927,6 +927,8 @@ err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len) 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); l->tap->_phy.setNotifyReadable(l->conn->dataSock, true); l->tap->_phy.whack(); } @@ -1395,6 +1397,7 @@ void NetconEthernetTap::handle_write(TcpConnection *conn) memmove(&conn->buf, (conn->buf+r), sz); } conn->idx -= r; + conn->written+=err; return; } } diff --git a/netcon/NetconService.hpp b/netcon/NetconService.hpp index fc6bd46c..41d745c2 100644 --- a/netcon/NetconService.hpp +++ b/netcon/NetconService.hpp @@ -57,7 +57,10 @@ namespace ZeroTier { bool pending; bool listening; int pid; - + + unsigned long written; + unsigned long acked; + PhySocket *rpcSock; PhySocket *dataSock; struct tcp_pcb *pcb; diff --git a/netcon/liblwip.so b/netcon/liblwip.so new file mode 100755 index 00000000..aba90d8e Binary files /dev/null and b/netcon/liblwip.so differ -- cgit v1.2.3