Merge pull request #511 from majestrate/master

address #510
pull/516/head
Jeff 5 years ago committed by GitHub
commit d253d9b05c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -152,8 +152,7 @@ namespace llarp
return true; return true;
} }
void void Message::AddServFail(RR_TTL_t)
Message::AddServFail(RR_TTL_t ttl)
{ {
if(questions.size()) if(questions.size())
{ {
@ -162,15 +161,6 @@ namespace llarp
hdr_fields |= flags_QR | flags_AA | flags_RA; hdr_fields |= flags_QR | flags_AA | flags_RA;
// don't allow recursion on this request // don't allow recursion on this request
hdr_fields &= ~flags_RD; hdr_fields &= ~flags_RD;
answers.emplace_back();
const auto& question = questions[0];
auto& nx = answers.back();
nx.rr_name = question.qname;
nx.rr_type = question.qtype;
nx.rr_class = question.qclass;
nx.ttl = ttl;
nx.rData.resize(1);
nx.rData.data()[0] = 0;
} }
} }
@ -294,8 +284,7 @@ namespace llarp
nx.rr_type = question.qtype; nx.rr_type = question.qtype;
nx.rr_class = question.qclass; nx.rr_class = question.qclass;
nx.ttl = ttl; nx.ttl = ttl;
nx.rData.resize(1); nx.rData.resize(0);
nx.rData.data()[0] = 0;
} }
} }
} }

@ -73,7 +73,6 @@ namespace llarp
if(connectTimeoutCount > chances) if(connectTimeoutCount > chances)
return connectTimeoutCount < connectGoodCount return connectTimeoutCount < connectGoodCount
&& (pathSuccessCount * chances) > pathFailCount; && (pathSuccessCount * chances) > pathFailCount;
chances /= 2;
return (pathSuccessCount * chances) > pathFailCount; return (pathSuccessCount * chances) > pathFailCount;
} }
@ -212,6 +211,7 @@ namespace llarp
llarp::LogWarn("failed to load router profiles from ", fname); llarp::LogWarn("failed to load router profiles from ", fname);
return false; return false;
} }
m_LastSave = llarp::time_now_ms();
return true; return true;
} }

@ -1146,6 +1146,8 @@ namespace llarp
{ {
for(const auto &rc : bootstrapRCList) for(const auto &rc : bootstrapRCList)
{ {
if(HasPendingConnectJob(rc.pubkey))
continue;
TryConnectAsync(rc, 4); TryConnectAsync(rc, 4);
dht()->impl->ExploreNetworkVia(dht::Key_t{rc.pubkey}); dht()->impl->ExploreNetworkVia(dht::Key_t{rc.pubkey});
} }

Loading…
Cancel
Save