diff options
| author | Joseph Henry <joseph.henry@gmail.com> | 2015-11-02 13:21:40 -0800 |
|---|---|---|
| committer | Joseph Henry <joseph.henry@gmail.com> | 2015-11-02 13:21:40 -0800 |
| commit | da462bbd55e6940efadf75b980708cb62fe23195 (patch) | |
| tree | 7dd3f0170b49d4abd36bc7f64ce661a525634ae7 | |
| parent | bb912cff30c3bb3620f7309cbe7e23290849d174 (diff) | |
| download | infinitytier-da462bbd55e6940efadf75b980708cb62fe23195.tar.gz infinitytier-da462bbd55e6940efadf75b980708cb62fe23195.zip | |
Removed curses dependency
| -rw-r--r-- | make-linux.mk | 2 | ||||
| -rw-r--r-- | netcon/NetconEthernetTap.cpp | 2 | ||||
| -rw-r--r-- | netcon/README.md | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/make-linux.mk b/make-linux.mk index af8d3967..2f60597c 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -85,7 +85,7 @@ else CFLAGS+=-Wall -fPIE -fvisibility=hidden -pthread $(INCLUDES) -DNDEBUG $(DEFS) CXXFLAGS?=-O3 -fstack-protector CXXFLAGS+=-Wall -Wreorder -fPIE -fvisibility=hidden -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS) - LDFLAGS=-ldl -lcurses -pie -Wl,-z,relro,-z,now + LDFLAGS=-ldl -pie -Wl,-z,relro,-z,now STRIP=strip --strip-all endif diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp index dd0f2c03..b2d09f17 100644 --- a/netcon/NetconEthernetTap.cpp +++ b/netcon/NetconEthernetTap.cpp @@ -49,8 +49,6 @@ #include "Intercept.h" #include "NetconUtilities.hpp" -#include <curses.h> - #define APPLICATION_POLL_FREQ 20 #define ZT_LWIP_TCP_TIMER_INTERVAL 10 #define STATUS_TMR_INTERVAL 1000 // How often we check connection statuses diff --git a/netcon/README.md b/netcon/README.md index 72bbdf70..79c35861 100644 --- a/netcon/README.md +++ b/netcon/README.md @@ -94,12 +94,12 @@ To run a simple RX/TX test: Network Containers have been tested with the following: - sshd [ WORKS as of 20151022] Long ~15-20s delay for client during connect - ssh [ WORKS as of 20151022] + sshd [ WORKS as of 20151102] Long ~15-20s delay for client during connect + ssh [ WORKS as of 20151102] sftp [ WORKS as of 20151022] - curl [ WORKS as of 20151021] Sometimes "tcp_input: pcb->next != pcb (before cache)" is seen + curl [ WORKS as of 20151021] apache (debug mode) [ WORKS as of 20150810] - apache (prefork MPM) [ WORKS as of 20151021] + apache (prefork MPM) [ WORKS as of 20151102] nginx [ WORKS as of 20151022] nodejs [ WORKS as of 20151021] java [ WORKS as of 20151010] |