void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework Phy<> to clean up _socks entries only in poll() to fix instability in proxy.

Browse source
This commit is contained in:
Adam Ierymenko 2015-06-09 16:27:11 +02:00
parent ab720a6f1e
commit 17ca5be4c1
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
osdep/Phy.hpp
View file

@ -123,12 +123,13 @@ private:
enum PhySocketType enum PhySocketType
{ {
ZT_PHY_SOCKET_TCP_OUT_PENDING = 0x00, ZT_PHY_SOCKET_CLOSED = 0x00, // socket is closed, will be removed on next poll()
ZT_PHY_SOCKET_TCP_OUT_CONNECTED = 0x01, ZT_PHY_SOCKET_TCP_OUT_PENDING = 0x01,
ZT_PHY_SOCKET_TCP_IN = 0x02, ZT_PHY_SOCKET_TCP_OUT_CONNECTED = 0x02,
ZT_PHY_SOCKET_TCP_LISTEN = 0x03, ZT_PHY_SOCKET_TCP_IN = 0x03,
ZT_PHY_SOCKET_RAW = 0x04, ZT_PHY_SOCKET_TCP_LISTEN = 0x04,
ZT_PHY_SOCKET_UDP = 0x05 ZT_PHY_SOCKET_RAW = 0x05,
ZT_PHY_SOCKET_UDP = 0x06
}; };
struct PhySocketImpl struct PhySocketImpl
@ -205,8 +206,10 @@ public:
~Phy() ~Phy()
{ {
while (!_socks.empty()) for(typename std::list<PhySocketImpl>::const_iterator s(_socks.begin());s!=_socks.end();++s) {
this->close((PhySocket *)&(_socks.front()),true); if (s->type != ZT_PHY_SOCKET_CLOSED)
this->close((PhySocket *)&(*s),true);
}
ZT_PHY_CLOSE_SOCKET(_whackReceiveSocket); ZT_PHY_CLOSE_SOCKET(_whackReceiveSocket);
ZT_PHY_CLOSE_SOCKET(_whackSendSocket); ZT_PHY_CLOSE_SOCKET(_whackSendSocket);
} }
@ -620,11 +623,7 @@ public:
#endif #endif
} }
bool atEnd = _socks.empty(); for(typename std::list<PhySocketImpl>::iterator s(_socks.begin());s!=_socks.end();) {
for(typename std::list<PhySocketImpl>::iterator s(_socks.begin()),nexts;(!atEnd);s=nexts) {
nexts = s; ++nexts; // we can delete the linked list item, so traverse now
atEnd = (nexts == _socks.end()); // if we delete the last element, s!=_socks.end() will no longer terminate our loop
switch (s->type) { switch (s->type) {
case ZT_PHY_SOCKET_TCP_OUT_PENDING: case ZT_PHY_SOCKET_TCP_OUT_PENDING:
@ -724,6 +723,10 @@ public:
break; break;
} }
if (s->type == ZT_PHY_SOCKET_CLOSED)
_socks.erase(s++);
else ++s;
} }
} }
@ -765,21 +768,15 @@ public:
break; break;
} }
long oldSock = (long)sws.sock; // Causes entry to be deleted from list in poll(), ignored elsewhere
sws.type = ZT_PHY_SOCKET_CLOSED;
for(typename std::list<PhySocketImpl>::iterator s(_socks.begin());s!=_socks.end();++s) { if (sws.sock >= _nfds) {
if (reinterpret_cast<PhySocket *>(&(*s)) == sock) {
_socks.erase(s);
break;
}
}
if (oldSock >= _nfds) {
long nfds = (long)_whackSendSocket; long nfds = (long)_whackSendSocket;
if ((long)_whackReceiveSocket > nfds) if ((long)_whackReceiveSocket > nfds)
nfds = (long)_whackReceiveSocket; nfds = (long)_whackReceiveSocket;
for(typename std::list<PhySocketImpl>::iterator s(_socks.begin());s!=_socks.end();++s) { for(typename std::list<PhySocketImpl>::iterator s(_socks.begin());s!=_socks.end();++s) {
if ((long)s->sock > nfds) if ((s->type != ZT_PHY_SOCKET_CLOSED)&&((long)s->sock > nfds))
nfds = (long)s->sock; nfds = (long)s->sock;
} }
_nfds = nfds; _nfds = nfds;