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

Yank a code path it turns out we probably don't want.

Browse Source
This commit is contained in:
Adam Ierymenko
2014-02-03 10:46:37 -08:00
parent a154d660d9
commit bf5f09a0c7
4 changed files with 34 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
node/Switch.cpp
View File

@@ -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());