gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed their_fd closure bug

Browse Source
This commit is contained in:
Joseph Henry
2015-09-24 17:33:25 -04:00
parent 1119f64a77
commit 8a8264bc39
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netcon/NetconService.hpp
View File

@@ -66,6 +66,7 @@ namespace ZeroTier {
class NetconConnection
{
public:
int perceived_fd;
int their_fd;
unsigned char buf[DEFAULT_READ_BUFFER_SIZE];
int idx;
@@ -113,7 +114,7 @@ namespace ZeroTier {
NetconConnection *getConnectionByTheirFD(int fd)
{
for(size_t i=0; i<connections.size(); i++) {
if(connections[i]->their_fd == fd) return connections[i];
if(connections[i]->perceived_fd == fd) return connections[i];
}
return NULL;
}
@@ -134,14 +135,6 @@ namespace ZeroTier {
}
return NULL;
}
void removeConnection(PhySocket *sock)
{
for(size_t i=0; i<connections.size(); i++) {
if(connections[i]->sock == sock)
connections.erase(connections.begin() + i);
}
}
};
} // namespace ZeroTier