summaryrefslogtreecommitdiff
path: root/netcon
diff options
context:
space:
mode:
Diffstat (limited to 'netcon')
-rw-r--r--netcon/NetconEthernetTap.cpp19
-rw-r--r--netcon/README.md8
-rwxr-xr-xnetcon/libintercept.so.1.0bin0 -> 56824 bytes
-rwxr-xr-xnetcon/liblwip.sobin0 -> 333688 bytes
4 files changed, 20 insertions, 7 deletions
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
index a4e2eacd..e17acbbf 100644
--- a/netcon/NetconEthernetTap.cpp
+++ b/netcon/NetconEthernetTap.cpp
@@ -50,7 +50,7 @@
#include "NetconUtilities.hpp"
#define APPLICATION_POLL_FREQ 20
-#define ZT_LWIP_TCP_TIMER_INTERVAL 50
+#define ZT_LWIP_TCP_TIMER_INTERVAL 5
#define STATUS_TMR_INTERVAL 2000 // How often we check connection statuses
#define DEBUG_LEVEL 3
@@ -418,22 +418,26 @@ void NetconEthernetTap::threadMain()
fprintf(stderr, "- MEM_SIZE = %dM\n", MEM_SIZE / (1024*1024));
- fprintf(stderr, "- TCP_SND_BUF = %dK\n", TCP_SND_BUF / 1024);
+ fprintf(stderr, "- PBUF_POOL_SIZE = %d\n", PBUF_POOL_SIZE);
+ fprintf(stderr, "- PBUF_POOL_BUFSIZE = %d\n", PBUF_POOL_BUFSIZE);
fprintf(stderr, "- MEMP_NUM_PBUF = %d\n", MEMP_NUM_PBUF);
fprintf(stderr, "- MEMP_NUM_TCP_PCB = %d\n", MEMP_NUM_TCP_PCB);
fprintf(stderr, "- MEMP_NUM_TCP_PCB_LISTEN = %d\n", MEMP_NUM_TCP_PCB_LISTEN);
- fprintf(stderr, "- MEMP_NUM_TCP_SEG = %d\n", MEMP_NUM_TCP_SEG);
- fprintf(stderr, "- PBUF_POOL_SIZE = %d\n", PBUF_POOL_SIZE);
- fprintf(stderr, "- TCP_SND_QUEUELEN = %d\n", TCP_SND_QUEUELEN);
- fprintf(stderr, "- TCP_MAXRTX = %d\n", TCP_MAXRTX);
- fprintf(stderr, "- IP_REASSEMBLY = %d\n", IP_REASSEMBLY);
+ fprintf(stderr, "- MEMP_NUM_TCP_SEG = %d\n\n", MEMP_NUM_TCP_SEG);
+
+ fprintf(stderr, "- TCP_SND_BUF = %dK\n", TCP_SND_BUF / 1024);
+ fprintf(stderr, "- TCP_SND_QUEUELEN = %d\n\n", TCP_SND_QUEUELEN);
+
fprintf(stderr, "- TCP_WND = %d\n", TCP_WND);
fprintf(stderr, "- TCP_MSS = %d\n", TCP_MSS);
+ fprintf(stderr, "- TCP_MAXRTX = %d\n", TCP_MAXRTX);
+ fprintf(stderr, "- IP_REASSEMBLY = %d\n\n", IP_REASSEMBLY);
fprintf(stderr, "- ARP_TMR_INTERVAL = %d\n", ARP_TMR_INTERVAL);
fprintf(stderr, "- TCP_TMR_INTERVAL = %d\n", TCP_TMR_INTERVAL);
fprintf(stderr, "- IP_TMR_INTERVAL = %d\n", IP_TMR_INTERVAL);
+
// Main timer loop
while (_run) {
uint64_t now = OSUtils::now();
@@ -929,6 +933,7 @@ err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *tpcb, u16_t len)
if(len) {
l->conn->acked+=len;
//dwr("W = %d, A = %d\n", l->conn->written, l->conn->acked);
+ dwr("ACK = %d\n", len);
l->tap->_phy.setNotifyReadable(l->conn->dataSock, true);
l->tap->_phy.whack();
}
diff --git a/netcon/README.md b/netcon/README.md
index 9bb8dbdb..26543cc4 100644
--- a/netcon/README.md
+++ b/netcon/README.md
@@ -163,3 +163,11 @@ To Test:
- sshd will enter an infinite accept loop maxing out CPU if service dies
+### Speed Notes
+
+http://lwip.100.n7.nabble.com/Performance-question-td4545.html
+ - 120-140Mbps, erroneous reports of 300-400 Mbps, claims linux stack is capable of 180Mbps
+
+
+
+
diff --git a/netcon/libintercept.so.1.0 b/netcon/libintercept.so.1.0
new file mode 100755
index 00000000..701a5b4e
--- /dev/null
+++ b/netcon/libintercept.so.1.0
Binary files differ
diff --git a/netcon/liblwip.so b/netcon/liblwip.so
new file mode 100755
index 00000000..641859c3
--- /dev/null
+++ b/netcon/liblwip.so
Binary files differ