ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-29 13:34:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed connection closure issue

Browse Source
This commit is contained in:
Joseph Henry 2015-09-24 17:10:30 -04:00
parent c25ceaf06b
commit 1119f64a77
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netcon/NetconEthernetTap.cpp
View File

@ -292,15 +292,20 @@ void NetconEthernetTap::closeAllClients()
void NetconEthernetTap::closeConnection(NetconConnection *conn) void NetconEthernetTap::closeConnection(NetconConnection *conn)
{ {
NetconClient *client = conn->owner; NetconClient *client = conn->owner;
if(conn->pcb == NULL) {
fprintf(stderr, "closeConnection(): PCB is null\n");
return;
}
lwipstack->_tcp_arg(conn->pcb, NULL); lwipstack->_tcp_arg(conn->pcb, NULL);
lwipstack->_tcp_sent(conn->pcb, NULL); lwipstack->_tcp_sent(conn->pcb, NULL);
lwipstack->_tcp_recv(conn->pcb, NULL); lwipstack->_tcp_recv(conn->pcb, NULL);
lwipstack->_tcp_err(conn->pcb, NULL); lwipstack->_tcp_err(conn->pcb, NULL);
lwipstack->_tcp_poll(conn->pcb, NULL, 0); lwipstack->_tcp_poll(conn->pcb, NULL, 0);
lwipstack->_tcp_close(conn->pcb); close(_phy.getDescriptor(conn->sock));
_phy.close(conn->sock); _phy.close(conn->sock);
lwipstack->_tcp_close(conn->pcb); lwipstack->_tcp_close(conn->pcb);
client->removeConnection(conn->sock); client->removeConnection(conn->sock);
delete conn;
} }
/* /*
@ -313,12 +318,9 @@ void NetconEthernetTap::closeClient(NetconClient *client)
closeConnection(client->rpc); closeConnection(client->rpc);
closeConnection(client->unmapped_conn); closeConnection(client->unmapped_conn);
} }
for(size_t i=0; i<client->connections.size(); i++) while(client->connections.size()){
{ closeConnection(client->connections.front());
close(_phy.getDescriptor(client->connections[i]->sock)); client->connections.erase(client->connections.begin());
lwipstack->tcp_close(client->connections[i]->pcb);
delete client->connections[i];
client->connections.erase(client->connections.begin() + i);
} }
} }
@ -384,9 +386,9 @@ void NetconEthernetTap::threadMain()
void NetconEthernetTap::phyOnUnixClose(PhySocket *sock,void **uptr) void NetconEthernetTap::phyOnUnixClose(PhySocket *sock,void **uptr)
{ {
//fprintf(stderr, "phyOnUnixClose()\n"); fprintf(stderr, "phyOnUnixClose()\n");
//close(_phy.getDescriptor(sock)); //close(_phy.getDescriptor(sock));
// TODO: close client closeClient((NetconClient*)*uptr);
} }
/* /*