ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-23 14:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed memory leak

Browse Source
This commit is contained in:
Joseph Henry 2016-01-17 14:32:34 -08:00
parent 58ebfdffcb
commit a73638b214
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
netcon/NetconEthernetTap.cpp
View File

@ -420,6 +420,7 @@ void NetconEthernetTap::removeConnection(TcpConnection *conn)
for(size_t i=0;i<_TcpConnections.size();++i) {
if(_TcpConnections[i] == conn){
_TcpConnections.erase(_TcpConnections.begin() + i);
delete conn;
return;
}
}
@ -435,18 +436,17 @@ void NetconEthernetTap::closeConnection(PhySocket *sock)
TcpConnection *conn = getConnection(sock);
if(!conn)
return;
else
removeConnection(conn);
if(!conn->pcb)
return;
if(conn->pcb->state == SYN_SENT || conn->pcb->state == CLOSE_WAIT) {
dwr(MSG_DEBUG," closeConnection(): invalid PCB state for this operation. ignoring.\n");
return;
}
dwr(MSG_DEBUG," closeConnection(): PCB->state = %d\n", conn->pcb->state);
if(lwipstack->_tcp_close(conn->pcb) != ERR_OK) {
dwr(MSG_ERROR," closeConnection(): error while calling tcp_close()\n");
if(conn->pcb) {
if(conn->pcb->state == SYN_SENT || conn->pcb->state == CLOSE_WAIT) {
dwr(MSG_DEBUG," closeConnection(): invalid PCB state for this operation. ignoring.\n");
return;
}
dwr(MSG_DEBUG," closeConnection(): PCB->state = %d\n", conn->pcb->state);
if(lwipstack->_tcp_close(conn->pcb) != ERR_OK) {
dwr(MSG_ERROR," closeConnection(): error while calling tcp_close()\n");
}
}
removeConnection(conn);
if(!sock)
return;
close(_phy.getDescriptor(sock));