ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-31 16:35:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unload lwipstack->_libref upon exit

Browse Source
This commit is contained in:
Joseph Henry 2015-10-22 16:26:29 -07:00
parent 2f4628520b
commit 236e474553
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
netcon/NetconEthernetTap.cpp
View File

@ -51,7 +51,7 @@
#define APPLICATION_POLL_FREQ 5 #define APPLICATION_POLL_FREQ 5
#define ZT_LWIP_TCP_TIMER_INTERVAL 10 #define ZT_LWIP_TCP_TIMER_INTERVAL 10
#define STATUS_TMR_INTERVAL 500 #define STATUS_TMR_INTERVAL 500 // How often we check connection statuses
namespace ZeroTier { namespace ZeroTier {
@ -293,7 +293,7 @@ void NetconEthernetTap::closeConnection(TcpConnection *conn)
*/ */
void NetconEthernetTap::closeClient(PhySocket *sock) void NetconEthernetTap::closeClient(PhySocket *sock)
{ {
for(int i=0; i<rpc_sockets.size(); i++) { for(size_t i=0; i<rpc_sockets.size(); i++) {
if(rpc_sockets[i] == sock){ if(rpc_sockets[i] == sock){
rpc_sockets.erase(rpc_sockets.begin() + i); rpc_sockets.erase(rpc_sockets.begin() + i);
break; break;
@ -314,10 +314,11 @@ void NetconEthernetTap::closeAll()
closeConnection(tcp_connections.front()); closeConnection(tcp_connections.front());
} }
#include <sys/resource.h>
void NetconEthernetTap::threadMain() void NetconEthernetTap::threadMain()
throw() throw()
{ {
fprintf(stderr, "_threadMain()\n");
uint64_t prev_tcp_time = 0; uint64_t prev_tcp_time = 0;
uint64_t prev_status_time = 0; uint64_t prev_status_time = 0;
uint64_t prev_etharp_time = 0; uint64_t prev_etharp_time = 0;
@ -353,29 +354,25 @@ void NetconEthernetTap::threadMain()
if (since_status >= STATUS_TMR_INTERVAL) { if (since_status >= STATUS_TMR_INTERVAL) {
prev_status_time = now; prev_status_time = now;
fprintf(stderr, "tcp_conns = %d, rpc_socks = %d\n", tcp_connections.size(), rpc_sockets.size()); if(rpc_sockets.size() || tcp_connections.size()) {
/* Here we will periodically check the list of rpc_sockets for those that
/* Here we will periodically check the list of rpc_sockets for any which do not currently have any data connection associated with them. If they are
do not currently have any data connection associated with them. If they are unused, then we will try to read from them, if they fail, we can safely assume
unused, then we will try to read from them, if they fail, we can safely assumes that the client has closed their end and we can close ours */
that the client has closed their and we can close ours */ for(size_t i=0, associated = 0; i<rpc_sockets.size(); i++, associated = 0) {
for(size_t j=0; j<tcp_connections.size(); j++) {
for(int i=0, associated = 0; i<rpc_sockets.size(); i++, associated = 0) { if(tcp_connections[j]->rpcSock == rpc_sockets[i])
for(int j=0; j<tcp_connections.size(); j++) { associated++;
if(tcp_connections[j]->rpcSock == rpc_sockets[i])
associated++;
}
if(!associated){
// No TCP connections are associated, this is a candidate for removal
//fprintf(stderr, "removing RPC connection... \n");
char c;
if(read(_phy.getDescriptor(rpc_sockets[i]),&c,1) < 0) {
closeClient(rpc_sockets[i]);
} }
else { if(!associated){
//fprintf(stderr, "this appears to be in use.\n"); // No TCP connections are associated, this is a candidate for removal
char c;
if(read(_phy.getDescriptor(rpc_sockets[i]),&c,1) < 0) {
closeClient(rpc_sockets[i]);
}
} }
} }
fprintf(stderr, "tcp_conns = %d, rpc_socks = %d\n", tcp_connections.size(), rpc_sockets.size());
} }
} }
if (since_tcp >= ZT_LWIP_TCP_TIMER_INTERVAL) { if (since_tcp >= ZT_LWIP_TCP_TIMER_INTERVAL) {
@ -393,7 +390,7 @@ void NetconEthernetTap::threadMain()
_phy.poll((unsigned long)std::min(tcp_remaining,etharp_remaining)); _phy.poll((unsigned long)std::min(tcp_remaining,etharp_remaining));
} }
closeAll(); closeAll();
// TODO: cleanup -- destroy LWIP state, kill any clients, unload .so, etc. dlclose(lwipstack->_libref);
} }
void NetconEthernetTap::phyOnUnixClose(PhySocket *sock,void **uptr) void NetconEthernetTap::phyOnUnixClose(PhySocket *sock,void **uptr)

4
netcon/README.md
View File

@ -4,11 +4,11 @@ sshd [ WORKS as of 20151022] Long ~15-20s delay for client during connect
ssh [ WORKS as of 20151022] ssh [ WORKS as of 20151022]
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] Sometimes "tcp_input: pcb->next != pcb (before cache)" is seen
apache (debug mode) [ WORKS as of 2015xxxx] apache (debug mode) [ WORKS as of 20150810]
apache (prefork MPM) [ WORKS as of 20151021] apache (prefork MPM) [ WORKS as of 20151021]
nginx [ WORKS as of 20151022] nginx [ WORKS as of 20151022]
nodejs [ WORKS as of 20151021] nodejs [ WORKS as of 20151021]
java [ WORKS as of 2015xxxx] java [ WORKS as of 20151010]
tomcat [ WORKS as of 2015xxxx] tomcat [ WORKS as of 2015xxxx]
thttpd [ WORKS as of 2015xxxx] thttpd [ WORKS as of 2015xxxx]
vsftpd [BROKEN as of 20151021] Server sends 500 when 220 is expected vsftpd [BROKEN as of 20151021] Server sends 500 when 220 is expected