diff options
Diffstat (limited to 'node/Switch.cpp')
| -rw-r--r-- | node/Switch.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index bf4f812d..a759a01b 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -218,11 +218,7 @@ bool Switch::sendHELLO(const SharedPtr<Peer> &dest,Demarc::Port localPort,const outp.append(now); _r->identity.serialize(outp,false); outp.armor(dest->key(),false); - - if (_r->demarc->send(localPort,remoteAddr,outp.data(),outp.size(),-1)) { - dest->expectResponseTo(outp.packetId(),Packet::VERB_HELLO,localPort,now); - return true; - } else return false; + return _r->demarc->send(localPort,remoteAddr,outp.data(),outp.size(),-1); } bool Switch::unite(const Address &p1,const Address &p2,bool force) @@ -737,14 +733,6 @@ bool Switch::_trySend(const Packet &packet,bool encrypt) } } - switch(packet.verb()) { - case Packet::VERB_HELLO: - peer->expectResponseTo(packet.packetId(),Packet::VERB_HELLO,localPort,now); - break; - default: - break; - } - #ifdef ZT_TRACE if (via != peer) { TRACE(">> %s to %s via %s (%d)",Packet::verbString(packet.verb()),peer->address().toString().c_str(),via->address().toString().c_str(),(int)packet.size()); |