From 1f4b1b07b037ab5df78843ca4add8af73bcc3324 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Wed, 26 Oct 2022 19:03:35 -0300 Subject: [PATCH] Rediff patches Add 0002-Remove-useless-iterator-assignments.patch: Add 0003-Fix-time_delta-seconds-formatting-in-milliseconds.patch: --- ...-Remove-useless-iterator-assignments.patch | 90 +++++++++++++++++++ ...a-seconds-formatting-in-milliseconds.patch | 24 +++++ debian/patches/series | 2 + 3 files changed, 116 insertions(+) create mode 100644 debian/patches/0002-Remove-useless-iterator-assignments.patch create mode 100644 debian/patches/0003-Fix-time_delta-seconds-formatting-in-milliseconds.patch diff --git a/debian/patches/0002-Remove-useless-iterator-assignments.patch b/debian/patches/0002-Remove-useless-iterator-assignments.patch new file mode 100644 index 000000000..1b9c05504 --- /dev/null +++ b/debian/patches/0002-Remove-useless-iterator-assignments.patch @@ -0,0 +1,90 @@ +From: Jason Rhinelander +Date: Wed, 26 Oct 2022 17:10:54 -0300 +Subject: Remove useless iterator assignments + +A back_inserter doesn't change when you insert onto it. +--- + llarp/router/router.cpp | 18 +++++++++--------- + llarp/router_contact.cpp | 6 +++--- + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp +index f11a57b..24ad452 100644 +--- a/llarp/router/router.cpp ++++ b/llarp/router/router.cpp +@@ -888,32 +888,32 @@ namespace llarp + { + std::string status; + auto out = std::back_inserter(status); +- out = fmt::format_to(out, "WATCHDOG=1\nSTATUS=v{}", llarp::VERSION_STR); ++ fmt::format_to(out, "WATCHDOG=1\nSTATUS=v{}", llarp::VERSION_STR); + if (IsServiceNode()) + { +- out = fmt::format_to( ++ fmt::format_to( + out, + " snode | known/svc/clients: {}/{}/{}", + nodedb()->NumLoaded(), + NumberOfConnectedRouters(), + NumberOfConnectedClients()); +- out = fmt::format_to( ++ fmt::format_to( + out, + " | {} active paths | block {} ", + pathContext().CurrentTransitPaths(), + (m_lokidRpcClient ? m_lokidRpcClient->BlockHeight() : 0)); +- out = fmt::format_to( ++ fmt::format_to( + out, + " | gossip: (next/last) {} / ", + time_delta{_rcGossiper.NextGossipAt()}); + if (auto maybe = _rcGossiper.LastGossipAt()) +- out = fmt::format_to(out, "{}", time_delta{*maybe}); ++ fmt::format_to(out, "{}", time_delta{*maybe}); + else +- out = fmt::format_to(out, "never"); ++ fmt::format_to(out, "never"); + } + else + { +- out = fmt::format_to( ++ fmt::format_to( + out, + " client | known/connected: {}/{}", + nodedb()->NumLoaded(), +@@ -921,7 +921,7 @@ namespace llarp + + if (auto ep = hiddenServiceContext().GetDefault()) + { +- out = fmt::format_to( ++ fmt::format_to( + out, + " | paths/endpoints {}/{}", + pathContext().CurrentOwnedPaths(), +@@ -929,7 +929,7 @@ namespace llarp + + if (auto success_rate = ep->CurrentBuildStats().SuccessRatio(); success_rate < 0.5) + { +- out = fmt::format_to( ++ fmt::format_to( + out, " [ !!! Low Build Success Rate ({:.1f}%) !!! ]", (100.0 * success_rate)); + } + }; +diff --git a/llarp/router_contact.cpp b/llarp/router_contact.cpp +index 9004c1c..a0655f1 100644 +--- a/llarp/router_contact.cpp ++++ b/llarp/router_contact.cpp +@@ -116,10 +116,10 @@ namespace llarp + std::string result; + auto out = std::back_inserter(result); + for (const auto& addr : addrs) +- out = fmt::format_to(out, "ai_addr={}; ai_pk={}; ", addr.toIpAddress(), addr.pubkey); +- out = fmt::format_to(out, "updated={}; onion_pk={}; ", last_updated.count(), enckey.ToHex()); ++ fmt::format_to(out, "ai_addr={}; ai_pk={}; ", addr.toIpAddress(), addr.pubkey); ++ fmt::format_to(out, "updated={}; onion_pk={}; ", last_updated.count(), enckey.ToHex()); + if (routerVersion.has_value()) +- out = fmt::format_to(out, "router_version={}; ", *routerVersion); ++ fmt::format_to(out, "router_version={}; ", *routerVersion); + return result; + } + diff --git a/debian/patches/0003-Fix-time_delta-seconds-formatting-in-milliseconds.patch b/debian/patches/0003-Fix-time_delta-seconds-formatting-in-milliseconds.patch new file mode 100644 index 000000000..c1b79681b --- /dev/null +++ b/debian/patches/0003-Fix-time_delta-seconds-formatting-in-milliseconds.patch @@ -0,0 +1,24 @@ +From: Jason Rhinelander +Date: Wed, 26 Oct 2022 17:19:00 -0300 +Subject: Fix time_delta formatting in milliseconds + +The time_delta was using the wrong duration type when formatting, so +was outputting millisecond precision in the systemd status string which +is pointless (and unintended). +--- + llarp/util/time.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llarp/util/time.hpp b/llarp/util/time.hpp +index fbf9997..c50c28b 100644 +--- a/llarp/util/time.hpp ++++ b/llarp/util/time.hpp +@@ -42,7 +42,7 @@ namespace fmt + format(const llarp::time_delta& td, FormatContext& ctx) + { + const auto dlt = +- std::chrono::duration_cast(llarp::TimePoint_t::clock::now() - td.at); ++ std::chrono::duration_cast(llarp::TimePoint_t::clock::now() - td.at); + using Parent = formatter; + if (dlt > 0s) + return Parent::format(fmt::format("{} ago", dlt), ctx); diff --git a/debian/patches/series b/debian/patches/series index 3160694c9..c2cdd7be8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 0001-proper-handling-of-public-ips.patch +0002-Remove-useless-iterator-assignments.patch +0003-Fix-time_delta-seconds-formatting-in-milliseconds.patch