oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

ping less and try not to double free in llarp_router::SendToOrQueue

Browse source
This commit is contained in:
Jeff Becker 2018-09-30 08:01:58 -04:00
parent ed5867e49f
commit 2b8bd11f5e
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
llarp/link/utp.cpp
View file

@ -576,7 +576,9 @@ namespace llarp
SendQueueBacklog = [&]() -> size_t { return sendq.size(); };
SendKeepAlive = [&]() -> bool {
if(sendq.size() == 0 && state == eSessionReady)
auto now = llarp_time_now_ms();
if(sendq.size() == 0 && state == eSessionReady && now > lastActive
&& now - lastActive > (sessionTimeout / 4))
{
DiscardMessage msg;
byte_t tmp[128] = {0};

27
llarp/router.cpp
View file

@ -158,18 +158,27 @@ bool
llarp_router::SendToOrQueue(const llarp::RouterID &remote,
const llarp::ILinkMessage *msg)
{
llarp::ILinkLayer *chosen = nullptr;
if(inboundLinks.size() == 0)
chosen = outboundLink.get();
else
chosen = inboundLinks[0].get();
if(chosen->HasSessionTo(remote))
{
SendTo(remote, msg, chosen);
return true;
if(outboundLink->HasSessionTo(remote))
{
SendTo(remote, msg, outboundLink.get());
return true;
}
}
else
{
for(const auto &link : inboundLinks)
{
if(link->HasSessionTo(remote))
{
SendTo(remote, msg, link.get());
return true;
}
}
}
// no link available
// this will create an entry in the obmq if it's not already there
auto itr = outboundMessageQueue.find(remote);
if(itr == outboundMessageQueue.end())