diff --git a/llarp/iwp/session.hpp b/llarp/iwp/session.hpp index 98e9ba8ac..56044ffd8 100644 --- a/llarp/iwp/session.hpp +++ b/llarp/iwp/session.hpp @@ -26,7 +26,7 @@ namespace llarp /// How long to keep a replay window for static constexpr auto ReplayWindow = (ReceivalTimeout * 3) / 2; /// How often to acks RX messages - static constexpr auto ACKResendInterval = DeliveryTimeout / 4; + static constexpr auto ACKResendInterval = DeliveryTimeout / 2; /// How often to retransmit TX fragments static constexpr auto TXFlushInterval = (DeliveryTimeout / 5) * 4; /// How often we send a keepalive diff --git a/llarp/net/ip_packet.cpp b/llarp/net/ip_packet.cpp index 397e4bc20..494ed8ef7 100644 --- a/llarp/net/ip_packet.cpp +++ b/llarp/net/ip_packet.cpp @@ -12,7 +12,7 @@ #include #include -constexpr uint32_t ipv6_flowlabel_mask = 0b00000000000011111111111111111111; +constexpr uint32_t ipv6_flowlabel_mask = 0b0000'0000'0000'1111'1111'1111'1111'1111; void ipv6_header::FlowLabel(llarp::nuint32_t label) diff --git a/llarp/net/ip_range_map.hpp b/llarp/net/ip_range_map.hpp index c928856bb..37adc7670 100644 --- a/llarp/net/ip_range_map.hpp +++ b/llarp/net/ip_range_map.hpp @@ -53,8 +53,8 @@ namespace llarp void ForEachEntry(Visit_t visit) const { - for (const auto& entry : m_Entries) - visit(entry.first, entry.second); + for (const auto& [range, value] : m_Entries) + visit(range, value); } /// convert all values into type T using a transformer diff --git a/llarp/net/net.cpp b/llarp/net/net.cpp index a6a9e5068..725c0aa96 100644 --- a/llarp/net/net.cpp +++ b/llarp/net/net.cpp @@ -505,17 +505,17 @@ namespace llarp }; // generate possible ranges to in order of attempts std::list possibleRanges; - for (byte_t oct = 0; oct < 255; ++oct) + for (byte_t oct = 16; oct < 32; ++oct) { - possibleRanges.emplace_back(IPRange::FromIPv4(10, oct, 0, 1, 16)); + possibleRanges.emplace_back(IPRange::FromIPv4(172, oct, 0, 1, 16)); } for (byte_t oct = 0; oct < 255; ++oct) { - possibleRanges.emplace_back(IPRange::FromIPv4(192, 168, oct, 1, 24)); + possibleRanges.emplace_back(IPRange::FromIPv4(10, oct, 0, 1, 16)); } for (byte_t oct = 0; oct < 255; ++oct) { - possibleRanges.emplace_back(IPRange::FromIPv4(172, 16, oct, 1, 24)); + possibleRanges.emplace_back(IPRange::FromIPv4(192, 168, oct, 1, 24)); } // for each possible range pick the first one we don't own for (const auto& range : possibleRanges) diff --git a/llarp/nodedb.cpp b/llarp/nodedb.cpp index 3fa4f7eea..70c48c828 100644 --- a/llarp/nodedb.cpp +++ b/llarp/nodedb.cpp @@ -57,13 +57,6 @@ llarp_nodedb::Get(const llarp::RouterID& pk, llarp::RouterContact& result) return true; } -void -KillRCJobs(const std::set& files) -{ - for (const auto& file : files) - fs::remove(file); -} - void llarp_nodedb::RemoveIf(std::function filter) { @@ -82,7 +75,10 @@ llarp_nodedb::RemoveIf(std::function filte ++itr; } } - disk(std::bind(&KillRCJobs, files)); + disk([files = std::move(files)]() { + for (const auto& file : files) + fs::remove(file); + }); } bool @@ -272,7 +268,7 @@ llarp_nodedb::ShouldSaveToDisk(llarp_time_t now) const void llarp_nodedb::AsyncFlushToDisk() { - disk(std::bind(&llarp_nodedb::SaveAll, this)); + disk([this]() { SaveAll(); }); m_NextSaveToDisk = llarp::time_now_ms() + m_SaveInterval; } diff --git a/llarp/path/transit_hop.cpp b/llarp/path/transit_hop.cpp index 167f57eda..4f497441f 100644 --- a/llarp/path/transit_hop.cpp +++ b/llarp/path/transit_hop.cpp @@ -248,8 +248,8 @@ namespace llarp { if (m_UpstreamQueue && not m_UpstreamQueue->empty()) { - r->QueueWork([self = shared_from_this(), data = std::move(m_UpstreamQueue), r]() { - self->UpstreamWork(data, r); + r->QueueWork([self = shared_from_this(), data = std::move(m_UpstreamQueue), r]() mutable { + self->UpstreamWork(std::move(data), r); }); } m_UpstreamQueue = nullptr; @@ -260,8 +260,8 @@ namespace llarp { if (m_DownstreamQueue && not m_DownstreamQueue->empty()) { - r->QueueWork([self = shared_from_this(), data = std::move(m_DownstreamQueue), r]() { - self->DownstreamWork(data, r); + r->QueueWork([self = shared_from_this(), data = std::move(m_DownstreamQueue), r]() mutable { + self->DownstreamWork(std::move(data), r); }); } m_DownstreamQueue = nullptr; diff --git a/llarp/router/abstractrouter.hpp b/llarp/router/abstractrouter.hpp index f64acc2dd..90ae1e952 100644 --- a/llarp/router/abstractrouter.hpp +++ b/llarp/router/abstractrouter.hpp @@ -293,7 +293,7 @@ namespace llarp NotifyRouterEvent([[maybe_unused]] Params&&... args) const { #ifdef LOKINET_HIVE - hive->NotifyEvent(std::make_unique(args...)); + hive->NotifyEvent(std::make_unique(std::forward(args)...)); #endif } }; diff --git a/llarp/rpc/lokid_rpc_client.cpp b/llarp/rpc/lokid_rpc_client.cpp index abd82c312..304331125 100644 --- a/llarp/rpc/lokid_rpc_client.cpp +++ b/llarp/rpc/lokid_rpc_client.cpp @@ -155,7 +155,9 @@ namespace llarp return; } // inform router about the new list - LogicCall(m_Router->logic(), [r = m_Router, nodeList]() { r->SetRouterWhitelist(nodeList); }); + LogicCall(m_Router->logic(), [r = m_Router, nodeList = std::move(nodeList)]() mutable { + r->SetRouterWhitelist(std::move(nodeList)); + }); } SecretKey diff --git a/readme.md b/readme.md index e22aabc65..2e40cbf80 100644 --- a/readme.md +++ b/readme.md @@ -77,7 +77,7 @@ build: $ mkdir build $ cd build $ cmake .. - $ make + $ make -j$(nproc) install: @@ -93,7 +93,7 @@ build: $ mkdir build $ cd build $ cmake .. - $ make + $ make -j$(nproc) install: