Browse Source

Removed curses dependency

Joseph Henry 9 years ago
parent
commit
da462bbd55
3 changed files with 5 additions and 7 deletions
  1. 1 1
      make-linux.mk
  2. 0 2
      netcon/NetconEthernetTap.cpp
  3. 4 4
      netcon/README.md

+ 1 - 1
make-linux.mk

@@ -85,7 +85,7 @@ else
 	CFLAGS+=-Wall -fPIE -fvisibility=hidden -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 	CFLAGS+=-Wall -fPIE -fvisibility=hidden -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 	CXXFLAGS?=-O3 -fstack-protector
 	CXXFLAGS?=-O3 -fstack-protector
 	CXXFLAGS+=-Wall -Wreorder -fPIE -fvisibility=hidden -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 	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
 	STRIP=strip --strip-all
 endif
 endif
 
 

+ 0 - 2
netcon/NetconEthernetTap.cpp

@@ -49,8 +49,6 @@
 #include "Intercept.h"
 #include "Intercept.h"
 #include "NetconUtilities.hpp"
 #include "NetconUtilities.hpp"
 
 
-#include <curses.h>
-
 #define APPLICATION_POLL_FREQ 				20
 #define APPLICATION_POLL_FREQ 				20
 #define ZT_LWIP_TCP_TIMER_INTERVAL 		10
 #define ZT_LWIP_TCP_TIMER_INTERVAL 		10
 #define STATUS_TMR_INTERVAL						1000 // How often we check connection statuses
 #define STATUS_TMR_INTERVAL						1000 // How often we check connection statuses

+ 4 - 4
netcon/README.md

@@ -94,12 +94,12 @@ To run a simple RX/TX test:
 
 
 Network Containers have been tested with the following:
 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]
 	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 (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]
 	nginx			[ WORKS as of 20151022]
 	nodejs			[ WORKS as of 20151021]
 	nodejs			[ WORKS as of 20151021]
 	java			[ WORKS as of 20151010]
 	java			[ WORKS as of 20151010]