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

Learn external IP addresses on OK(HELLO) too.

Browse source
This commit is contained in:
Adam Ierymenko 2015-04-30 16:40:04 -07:00
parent 5185103692
commit 9eb7698f0e
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
node/IncomingPacket.cpp
View file

@ -179,18 +179,17 @@ bool IncomingPacket::_doHELLO(const RuntimeEnvironment *RR)
Identity id; Identity id;
unsigned int destAddrPtr = id.deserialize(*this,ZT_PROTO_VERB_HELLO_IDX_IDENTITY) + ZT_PROTO_VERB_HELLO_IDX_IDENTITY; unsigned int destAddrPtr = id.deserialize(*this,ZT_PROTO_VERB_HELLO_IDX_IDENTITY) + ZT_PROTO_VERB_HELLO_IDX_IDENTITY;
unsigned int destAddrType = ZT_PROTO_DEST_ADDRESS_TYPE_NONE;
if (destAddrPtr < size()) // ZeroTier One < 1.0.3 did not include this field
destAddrType = (*this)[destAddrPtr++];
InetAddress destAddr; InetAddress destAddr;
switch(destAddrType) { if (destAddrPtr < size()) { // ZeroTier One < 1.0.3 did not include this field
case ZT_PROTO_DEST_ADDRESS_TYPE_IPV4: const unsigned int destAddrType = (*this)[destAddrPtr++];
destAddr.set(field(destAddrPtr,4),4,at<uint16_t>(destAddrPtr + 4)); switch(destAddrType) {
break; case ZT_PROTO_DEST_ADDRESS_TYPE_IPV4:
case ZT_PROTO_DEST_ADDRESS_TYPE_IPV6: destAddr.set(field(destAddrPtr,4),4,at<uint16_t>(destAddrPtr + 4));
destAddr.set(field(destAddrPtr,16),16,at<uint16_t>(destAddrPtr + 16)); break;
break; case ZT_PROTO_DEST_ADDRESS_TYPE_IPV6:
destAddr.set(field(destAddrPtr,16),16,at<uint16_t>(destAddrPtr + 16));
break;
}
} }
if (source() != id.address()) { if (source() != id.address()) {
@ -268,12 +267,13 @@ bool IncomingPacket::_doHELLO(const RuntimeEnvironment *RR)
peer->received(RR,_remoteAddress,_linkDesperation,hops(),packetId(),Packet::VERB_HELLO,0,Packet::VERB_NOP); peer->received(RR,_remoteAddress,_linkDesperation,hops(),packetId(),Packet::VERB_HELLO,0,Packet::VERB_NOP);
peer->setRemoteVersion(protoVersion,vMajor,vMinor,vRevision); peer->setRemoteVersion(protoVersion,vMajor,vMinor,vRevision);
bool trusted = false;
if (RR->topology->isSupernode(id.address())) { if (RR->topology->isSupernode(id.address())) {
RR->node->postNewerVersionIfNewer(vMajor,vMinor,vRevision); RR->node->postNewerVersionIfNewer(vMajor,vMinor,vRevision);
RR->sa->iam(id.address(),_remoteAddress,destAddr,true); trusted = true;
} else {
RR->sa->iam(id.address(),_remoteAddress,destAddr,false);
} }
if (destAddr)
RR->sa->iam(id.address(),_remoteAddress,destAddr,trusted);
Packet outp(id.address(),RR->identity.address(),Packet::VERB_OK); Packet outp(id.address(),RR->identity.address(),Packet::VERB_OK);
@ -328,6 +328,20 @@ bool IncomingPacket::_doOK(const RuntimeEnvironment *RR,const SharedPtr<Peer> &p
const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION]; const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION];
const unsigned int vRevision = at<uint16_t>(ZT_PROTO_VERB_HELLO__OK__IDX_REVISION); const unsigned int vRevision = at<uint16_t>(ZT_PROTO_VERB_HELLO__OK__IDX_REVISION);
InetAddress destAddr;
unsigned int destAddrPtr = ZT_PROTO_VERB_HELLO__OK__IDX_REVISION + 2; // dest address, if present, will start after 16-bit revision
if (destAddrPtr < size()) { // ZeroTier One < 1.0.3 did not include this field
const unsigned int destAddrType = (*this)[destAddrPtr++];
switch(destAddrType) {
case ZT_PROTO_DEST_ADDRESS_TYPE_IPV4:
destAddr.set(field(destAddrPtr,4),4,at<uint16_t>(destAddrPtr + 4));
break;
case ZT_PROTO_DEST_ADDRESS_TYPE_IPV6:
destAddr.set(field(destAddrPtr,16),16,at<uint16_t>(destAddrPtr + 16));
break;
}
}
if (vProto < ZT_PROTO_VERSION_MIN) { if (vProto < ZT_PROTO_VERSION_MIN) {
TRACE("%s(%s): OK(HELLO) dropped, protocol version too old",source().toString().c_str(),_remoteAddress.toString().c_str()); TRACE("%s(%s): OK(HELLO) dropped, protocol version too old",source().toString().c_str(),_remoteAddress.toString().c_str());
return true; return true;
@ -338,8 +352,13 @@ bool IncomingPacket::_doOK(const RuntimeEnvironment *RR,const SharedPtr<Peer> &p
peer->addDirectLatencyMeasurment(latency); peer->addDirectLatencyMeasurment(latency);
peer->setRemoteVersion(vProto,vMajor,vMinor,vRevision); peer->setRemoteVersion(vProto,vMajor,vMinor,vRevision);
if (RR->topology->isSupernode(peer->address())) bool trusted = false;
if (RR->topology->isSupernode(peer->address())) {
RR->node->postNewerVersionIfNewer(vMajor,vMinor,vRevision); RR->node->postNewerVersionIfNewer(vMajor,vMinor,vRevision);
trusted = true;
}
if (destAddr)
RR->sa->iam(peer->address(),_remoteAddress,destAddr,trusted);
} break; } break;
case Packet::VERB_WHOIS: { case Packet::VERB_WHOIS: {