Browse Source

Added debug statements for transfer test

Joseph Henry 9 years ago
parent
commit
df391c8413
4 changed files with 8 additions and 1 deletions
  1. 1 0
      ext/lwipopts.h
  2. 3 0
      netcon/NetconEthernetTap.cpp
  3. 4 1
      netcon/NetconService.hpp
  4. BIN
      netcon/liblwip.so

+ 1 - 0
ext/lwipopts.h

@@ -48,6 +48,7 @@
 //#define TCP_MSS 2048
 //#define TCP_MSS 2048
 //#define TCP_WND 512
 //#define TCP_WND 512
 
 
+#define LWIP_NOASSERT 1
 #define TCP_LISTEN_BACKLOG   0
 #define TCP_LISTEN_BACKLOG   0
 
 
 /*------------------------------------------------------------------------------
 /*------------------------------------------------------------------------------

+ 3 - 0
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");
 	dwr(5, " nc_sent()\n");
 	Larg *l = (Larg*)arg;
 	Larg *l = (Larg*)arg;
 	if(len) {
 	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.setNotifyReadable(l->conn->dataSock, true);
 		l->tap->_phy.whack();
 		l->tap->_phy.whack();
 	}
 	}
@@ -1395,6 +1397,7 @@ void NetconEthernetTap::handle_write(TcpConnection *conn)
 							memmove(&conn->buf, (conn->buf+r), sz);
 							memmove(&conn->buf, (conn->buf+r), sz);
 						}
 						}
 						conn->idx -= r;
 						conn->idx -= r;
+						conn->written+=err;
 						return;
 						return;
 					}
 					}
 				}
 				}

+ 4 - 1
netcon/NetconService.hpp

@@ -57,7 +57,10 @@ namespace ZeroTier {
     bool pending;
     bool pending;
     bool listening;
     bool listening;
     int pid;
     int pid;
-    
+
+    unsigned long written;
+    unsigned long acked;
+
     PhySocket *rpcSock;
     PhySocket *rpcSock;
     PhySocket *dataSock;
     PhySocket *dataSock;
     struct tcp_pcb *pcb;
     struct tcp_pcb *pcb;

BIN
netcon/liblwip.so