ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-24 07:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make relay max hops configurable on roots

Browse Source
This commit is contained in:
Adam Ierymenko 2019-09-03 13:17:12 -07:00
parent b6c5ba264b
commit 29be175743
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
root/root.cpp
View File

@ -23,6 +23,7 @@
* "name": Name of this root for documentation/UI purposes (string)
* "port": UDP port (int)
* "httpPort": Local HTTP port for basic stats (int)
* "relayMaxHops": Max hops (up to 7)
* "statsRoot": If present, path to periodically save stats files (string)
* "siblings": [
* {
@ -162,6 +163,7 @@ struct RootPeer
static int64_t startTime;
static std::vector<int> ports;
static int relayMaxHops = 0;
static Identity self;
static std::atomic_bool run;
static json config;
@ -450,7 +452,19 @@ static void handlePacket(const int v4s,const int v6s,const InetAddress *const ip
// sending a RENDEZVOUS message.
bool introduce = false;
if (!fragment) {
if (fragment) {
if ((int)reinterpret_cast<Packet::Fragment *>(&pkt)->incrementHops() > relayMaxHops) {
//printf("%s refused to forward to %s: max hop count exceeded" ZT_EOL_S,ip->toString(ipstr),dest.toString(astr));
discardedForwardRate.log(now,pkt.size());
return;
}
} else {
if ((int)pkt.incrementHops() > relayMaxHops) {
//printf("%s refused to forward to %s: max hop count exceeded" ZT_EOL_S,ip->toString(ipstr),dest.toString(astr));
discardedForwardRate.log(now,pkt.size());
return;
}
RendezvousKey rk(source,dest);
std::lock_guard<std::mutex> l(lastRendezvous_l);
int64_t &lr = lastRendezvous[rk];
@ -560,20 +574,6 @@ static void handlePacket(const int v4s,const int v6s,const InetAddress *const ip
}
}
if (fragment) {
if (reinterpret_cast<Packet::Fragment *>(&pkt)->incrementHops() >= ZT_RELAY_MAX_HOPS) {
//printf("%s refused to forward to %s: max hop count exceeded" ZT_EOL_S,ip->toString(ipstr),dest.toString(astr));
discardedForwardRate.log(now,pkt.size());
return;
}
} else {
if (pkt.incrementHops() >= ZT_RELAY_MAX_HOPS) {
//printf("%s refused to forward to %s: max hop count exceeded" ZT_EOL_S,ip->toString(ipstr),dest.toString(astr));
discardedForwardRate.log(now,pkt.size());
return;
}
}
for(auto i=toAddrs.begin();i!=toAddrs.end();++i) {
//printf("%s -> %s for %s -> %s (%u bytes)" ZT_EOL_S,ip->toString(ipstr),i->first->toString(ipstr2),source.toString(astr),dest.toString(astr2),pkt.size());
if (sendto(i->first->isV4() ? v4s : v6s,pkt.data(),pkt.size(),SENDTO_FLAGS,(const struct sockaddr *)i->first,(socklen_t)(i->first->isV4() ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6))) > 0) {
@ -747,6 +747,18 @@ int main(int argc,char **argv)
} catch ( ... ) {
statsRoot = "";
}
relayMaxHops = ZT_RELAY_MAX_HOPS;
try {
relayMaxHops = config["relayMaxHops"];
if (relayMaxHops > ZT_PROTO_MAX_HOPS)
relayMaxHops = ZT_PROTO_MAX_HOPS;
else if (relayMaxHops < 0)
relayMaxHops = 0;
} catch ( ... ) {
relayMaxHops = ZT_RELAY_MAX_HOPS;
}
try {
auto sibs = config["siblings"];
if (sibs.is_array()) {