Upgrade to the r27 NDK and fix a ton of new lints.

env/checks.mk

@@ -15,6 +15,8 @@ checks += bugprone-*
 checks/bugprone-argument-comment.StrictMode := true
 checks += -bugprone-branch-clone
 checks += -bugprone-easily-swappable-parameters
+# XXX: I should enable this check and do a comprehensive audit
+checks += -bugprone-empty-catch
 # XXX: this is higher priority but I'm not ready for this yet
 checks += -bugprone-exception-escape
 checks/bugprone-exception-escape.IgnoredExceptions := "broken_promise"
@@ -34,9 +36,12 @@ checks += -cert-env33-c
 checks += -cert-err58-cpp
 
 checks += clang-analyzer-*
+# XXX: this flags something in boost multiprecision (of course)
+checks += -clang-analyzer-core.BitwiseShift
 
 checks += cppcoreguidelines-*
 checks += -cppcoreguidelines-avoid-c-arrays
+checks += -cppcoreguidelines-avoid-capturing-lambda-coroutines
 # this check is the exact opposite of a good guideline :/
 checks += -cppcoreguidelines-avoid-const-or-ref-data-members
 checks += -cppcoreguidelines-avoid-do-while
@@ -49,6 +54,10 @@ checks += -cppcoreguidelines-avoid-reference-coroutine-parameters
 checks += -cppcoreguidelines-init-variables
 # XXX: I didn't pay any attention to whether this check was interesting or not
 checks += -cppcoreguidelines-macro-usage
+# this was accidentally helpful, actually, but isn't an acceptable decision :/
+checks += -cppcoreguidelines-misleading-capture-default-by-value
+# this check doesn't handle unused parameters; am I doing this wrong?!
+checks += -cppcoreguidelines-missing-std-forward
 checks += -cppcoreguidelines-non-private-member-variables-in-classes
 # XXX: the code which most hates this apparently does allow for memory leaks :(
 checks += -cppcoreguidelines-prefer-member-initializer
@@ -57,8 +66,13 @@ checks += -cppcoreguidelines-pro-bounds-array-to-pointer-decay
 checks += -cppcoreguidelines-pro-bounds-pointer-arithmetic
 checks += -cppcoreguidelines-pro-type-reinterpret-cast
 checks += -cppcoreguidelines-pro-type-union-access
+# XXX: this check is interesting, but I'm unsure about move/forward confusion
+checks += -cppcoreguidelines-rvalue-reference-param-not-moved
+checks/cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams := true
 # this check makes utility classes super frustrating :/
 checks += -cppcoreguidelines-special-member-functions
+# this check makes separates definitions of related variables
+checks += -cppcoreguidelines-use-default-member-init
 
 # XXX: I'm using a lot of statically constructed objects
 #checks += fuchsia-statically-constructed-objects
@@ -67,6 +81,9 @@ checks += fuchsia-virtual-inheritance
 checks += google-build-*
 
 checks += misc-*
+# I love the idea of this check, but boost does this a lot
+checks += -misc-header-include-cycle
+checks += -misc-include-cleaner
 checks += -misc-misplaced-const
 checks += -misc-no-recursion
 # this check doesn't allow for any protected members :/
@@ -76,6 +93,8 @@ checks += -misc-unused-parameters
 
 checks += modernize-*
 checks += -modernize-avoid-c-arrays
+# XXX: I don't want this, but it also crashes on boost::multiprecision::abs
+checks += -modernize-use-constraints
 checks += -modernize-use-default-member-init
 checks += -modernize-use-nodiscard
 checks += -modernize-use-trailing-return-type
@@ -84,6 +103,8 @@ checks += -modernize-use-using
 
 checks += performance-*
 checks/performance-move-const-arg.CheckTriviallyCopyableMove := 0
+# XXX: I am pretty sure I just disagree with this optimization
+checks += -performance-avoid-endl
 
 checks += readability-const-return-type
 checks += readability-container-size-empty
@@ -98,11 +119,6 @@ checks += readability-redundant-string-init
 checks += readability-static-definition-in-anonymous-namespace
 checks += readability-uniqueptr-delete-release
 
-ifeq ($(target),and)
-# XXX: boost multiprecision on android
-#checks += -clang-analyzer-core.UndefinedBinaryOperatorResult
-endif
-
 ifeq ($(target),win)
 # XXX: boost::asio::detail::do_throw_error should be [[noreturn]]
 # (though, marking it [[noreturn]] didn't actually make it work)

env/setup-ndk.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e
 set -o pipefail
-echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;26.3.11579264" "platforms;android-34" >/dev/null
+echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;27.0.12077973" "platforms;android-34" >/dev/null

lib-protocol/source/drain.hpp

@@ -90,7 +90,7 @@ class Sunk {
     }
 };
 
-template <typename Super_, typename Drain_, typename Inner_ = typename std::remove_reference<decltype(std::declval<Outer<Super_>>().Inner())>::type>
+template <typename Super_, typename Drain_, typename Inner_ = typename std::remove_reference_t<decltype(std::declval<Outer<Super_>>().Inner())>>
 class Sink :
     public Super_,
     public Sunk<Drain_, Inner_>

lib-protocol/source/jsonrpc.hpp

@@ -79,7 +79,7 @@ struct Numeric<true, Size_, Type_> {
 };
 
 template <typename Type_>
-struct Coded<Type_, typename std::enable_if<std::is_unsigned<Type_>::value>::type> :
+struct Coded<Type_, typename std::enable_if_t<std::is_unsigned_v<Type_>>> :
     public Numeric<false, sizeof(Type_), Type_>
 {
     static void Name(std::ostringstream &signature) {
@@ -88,7 +88,7 @@ struct Coded<Type_, typename std::enable_if<std::is_unsigned<Type_>::value>::typ
 };
 
 template <typename Type_>
-struct Coded<Type_, typename std::enable_if<std::is_signed<Type_>::value>::type> :
+struct Coded<Type_, typename std::enable_if_t<std::is_signed_v<Type_>>> :
     public Numeric<true, sizeof(Type_), Type_>
 {
     static void Name(std::ostringstream &signature) {
@@ -97,7 +97,7 @@ struct Coded<Type_, typename std::enable_if<std::is_signed<Type_>::value>::type>
 };
 
 template <size_t Bits_, boost::multiprecision::cpp_int_check_type Check_>
-struct Coded<boost::multiprecision::number<boost::multiprecision::backends::cpp_int_backend<Bits_, Bits_, boost::multiprecision::unsigned_magnitude, Check_, void>>, typename std::enable_if<Bits_ % 8 == 0>::type> :
+struct Coded<boost::multiprecision::number<boost::multiprecision::backends::cpp_int_backend<Bits_, Bits_, boost::multiprecision::unsigned_magnitude, Check_, void>>, typename std::enable_if_t<Bits_ % 8 == 0>> :
     public Numeric<false, (Bits_ >> 3), boost::multiprecision::number<boost::multiprecision::backends::cpp_int_backend<Bits_, Bits_, boost::multiprecision::unsigned_magnitude, Check_, void>>>
 {
     static void Name(std::ostringstream &signature) {
@@ -106,7 +106,7 @@ struct Coded<boost::multiprecision::number<boost::multiprecision::backends::cpp_
 };
 
 template <size_t Bits_, boost::multiprecision::cpp_int_check_type Check_>
-struct Coded<boost::multiprecision::number<boost::multiprecision::backends::cpp_int_backend<Bits_, Bits_, boost::multiprecision::signed_magnitude, Check_, void>>, typename std::enable_if<Bits_ % 8 == 0>::type> :
+struct Coded<boost::multiprecision::number<boost::multiprecision::backends::cpp_int_backend<Bits_, Bits_, boost::multiprecision::signed_magnitude, Check_, void>>, typename std::enable_if_t<Bits_ % 8 == 0>> :
     public Numeric<true, (Bits_ >> 3), boost::multiprecision::number<boost::multiprecision::backends::cpp_int_backend<Bits_, Bits_, boost::multiprecision::signed_magnitude, Check_, void>>>
 {
     static void Name(std::ostringstream &signature) {
@@ -161,7 +161,7 @@ struct Coded<bool, void> {
 };
 
 template <size_t Size_>
-struct Coded<Brick<Size_>, typename std::enable_if<Size_ == 32>::type> {
+struct Coded<Brick<Size_>, typename std::enable_if_t<Size_ == 32>> {
     static const bool dynamic_ = false;
 
     static void Name(std::ostringstream &signature) {

lib-protocol/source/lwip.hpp

@@ -56,6 +56,7 @@ typedef int SOCKET;
 using namespace rtc;
 
 // Event constants for the Dispatcher class.
+// NOLINTNEXTLINE(performance-enum-size)
 enum DispatcherEvent {
   DE_READ = 0x0001,
   DE_WRITE = 0x0002,

lib-protocol/source/memory.cpp

@@ -34,8 +34,9 @@
 // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
 
 namespace orc {
+namespace {
 
-static int file_(-1);
+int file_(-1);
 
 // XXX: there are a number of arrays in this file; are they correct?
 
@@ -74,7 +75,7 @@ class Out {
         if (value == 0)
             *--end = '0';
         else do {
-            unsigned digit(value % 10);
+            const unsigned digit(value % 10);
             value /= 10;
             *--end = static_cast<char>('0' + digit);
         } while (value != 0);
@@ -100,7 +101,7 @@ class Out {
         if (value == 0)
             *--end = '0';
         else do {
-            unsigned digit(value & 0xf);
+            const unsigned digit(value & 0xf);
             value >>= 4;
             *--end = static_cast<char>((digit < 10 ? '0' : 'a' - 10) + digit);
         } while (value != 0);
@@ -110,9 +111,9 @@ class Out {
     }
 };
 
-static size_t total_(0);
+size_t total_(0);
 
-static void Audit(size_t add, size_t sub) {
+void Audit(size_t add, size_t sub) {
     total_ += add;
     total_ -= sub;
     if (add < sub)
@@ -122,8 +123,8 @@ static void Audit(size_t add, size_t sub) {
     Out() << total_ << " (" << (add - sub) << ")";
 }
 
-static decltype(std::declval<_malloc_zone_t *>()->malloc) apl_malloc;
-static void *orc_malloc(struct _malloc_zone_t *zone, size_t size) {
+decltype(std::declval<_malloc_zone_t *>()->malloc) apl_malloc;
+void *orc_malloc(struct _malloc_zone_t *zone, size_t size) {
     auto value(apl_malloc(zone, size));
     if (value == nullptr)
         return nullptr;
@@ -134,8 +135,8 @@ static void *orc_malloc(struct _malloc_zone_t *zone, size_t size) {
     return value;
 }
 
-static decltype(std::declval<_malloc_zone_t *>()->calloc) apl_calloc;
-static void *orc_calloc(struct _malloc_zone_t *zone, size_t count, size_t size) {
+decltype(std::declval<_malloc_zone_t *>()->calloc) apl_calloc;
+void *orc_calloc(struct _malloc_zone_t *zone, size_t count, size_t size) {
     auto value(apl_calloc(zone, count, size));
     if (value == nullptr)
         return nullptr;
@@ -146,8 +147,8 @@ static void *orc_calloc(struct _malloc_zone_t *zone, size_t count, size_t size)
     return value;
 }
 
-static decltype(std::declval<_malloc_zone_t *>()->valloc) apl_valloc;
-static void *orc_valloc(struct _malloc_zone_t *zone, size_t size) {
+decltype(std::declval<_malloc_zone_t *>()->valloc) apl_valloc;
+void *orc_valloc(struct _malloc_zone_t *zone, size_t size) {
     auto value(apl_valloc(zone, size));
     if (value == nullptr)
         return nullptr;
@@ -158,8 +159,8 @@ static void *orc_valloc(struct _malloc_zone_t *zone, size_t size) {
     return value;
 }
 
-static decltype(std::declval<_malloc_zone_t *>()->realloc) apl_realloc;
-static void *orc_realloc(struct _malloc_zone_t *zone, void *old, size_t size) {
+decltype(std::declval<_malloc_zone_t *>()->realloc) apl_realloc;
+void *orc_realloc(struct _malloc_zone_t *zone, void *old, size_t size) {
     auto before(zone->size(zone, old));
     auto value(apl_realloc(zone, old, size));
     auto after(zone->size(zone, value));
@@ -169,42 +170,42 @@ static void *orc_realloc(struct _malloc_zone_t *zone, void *old, size_t size) {
     return value;
 }
 
-static decltype(std::declval<_malloc_zone_t *>()->free) apl_free;
-static void orc_free(struct _malloc_zone_t *zone, void *value) {
+decltype(std::declval<_malloc_zone_t *>()->free) apl_free;
+void orc_free(struct _malloc_zone_t *zone, void *value) {
     auto full(zone->size(zone, value));
     if (file_ != -1)
         Out() << "free(" << value << ")";
     Audit(0, full);
     return apl_free(zone, value);
 }
 
-static decltype(std::declval<_malloc_zone_t *>()->batch_malloc) apl_batch_malloc;
-static unsigned orc_batch_malloc(struct _malloc_zone_t *zone, size_t size, void **values, unsigned count) {
+decltype(std::declval<_malloc_zone_t *>()->batch_malloc) apl_batch_malloc;
+unsigned orc_batch_malloc(struct _malloc_zone_t *zone, size_t size, void **values, unsigned count) {
     count = apl_batch_malloc(zone, size, values, count);
     size_t full(0);
     for (size_t i(0); i != count; ++i) {
         full += zone->size(zone, values[i]);
         if (file_ != -1)
-            Out() << "batch_malloc(" << size << ", " << values << "[" << i << "]) = " << values[i];
+            Out() << "batch_malloc(" << size << ", " << reinterpret_cast<void *>(values) << "[" << i << "]) = " << values[i];
     }
     Audit(full, 0);
     return count;
 }
 
-static decltype(std::declval<_malloc_zone_t *>()->batch_free) apl_batch_free;
-static void orc_batch_free(struct _malloc_zone_t *zone, void **values, unsigned count) {
+decltype(std::declval<_malloc_zone_t *>()->batch_free) apl_batch_free;
+void orc_batch_free(struct _malloc_zone_t *zone, void **values, unsigned count) {
     size_t full(0);
     for (size_t i(0); i != count; ++i) {
         full += zone->size(zone, values[i]);
         if (file_ != -1)
-            Out() << "batch_free(" << values << "[" << i << "] = " << values[i] << ")";
+            Out() << "batch_free(" << reinterpret_cast<void *>(values) << "[" << i << "] = " << values[i] << ")";
     }
     Audit(0, full);
     return apl_batch_free(zone, values, count);
 }
 
-static decltype(std::declval<_malloc_zone_t *>()->memalign) apl_memalign;
-static void *orc_memalign(struct _malloc_zone_t *zone, size_t alignment, size_t size) {
+decltype(std::declval<_malloc_zone_t *>()->memalign) apl_memalign;
+void *orc_memalign(struct _malloc_zone_t *zone, size_t alignment, size_t size) {
     auto value(apl_memalign(zone, alignment, size));
     auto full(zone->size(zone, value));
     if (file_ != -1)
@@ -213,8 +214,8 @@ static void *orc_memalign(struct _malloc_zone_t *zone, size_t alignment, size_t
     return value;
 }
 
-static decltype(std::declval<_malloc_zone_t *>()->free_definite_size) apl_free_definite_size;
-static void orc_free_definite_size(struct _malloc_zone_t *zone, void *value, size_t size) {
+decltype(std::declval<_malloc_zone_t *>()->free_definite_size) apl_free_definite_size;
+void orc_free_definite_size(struct _malloc_zone_t *zone, void *value, size_t size) {
     auto full(zone->size(zone, value));
     if (file_ != -1)
         Out() << "free_definite_size(" << value << ", " << size << ")";
@@ -229,6 +230,9 @@ static void orc_free_definite_size(struct _malloc_zone_t *zone, void *value, siz
     zone->name = &orc_ ## name; \
 } while (false)
 
+} }
+
+namespace orc {
 void Hook() {
     return;
 
@@ -257,9 +261,7 @@ void Hook() {
     orc_swizzle(batch_free);
     orc_swizzle(memalign);
     orc_swizzle(free_definite_size);
-}
-
-}
+} }
 
 #else
 namespace orc {

lib-protocol/source/nest.hpp

@@ -94,7 +94,7 @@ class Nest final :
     }
 
     template <typename Code_>
-    auto Hatch(Code_ code, const char *name) noexcept -> typename std::enable_if<noexcept(code()), bool>::type {
+    auto Hatch(Code_ code, const char *name) noexcept -> typename std::enable_if_t<noexcept(code()), bool> {
         Count count(this);
         if (count > limit_)
             return false;

lib-protocol/source/spawn.hpp

@@ -110,7 +110,7 @@ class Detached {
 };
 
 template <typename Code_>
-auto Spawn(Code_ code, const char *name) noexcept -> typename std::enable_if<noexcept(code())>::type {
+auto Spawn(Code_ code, const char *name) noexcept -> typename std::enable_if_t<noexcept(code())> {
     [](Code_ code, const char *name) mutable noexcept -> Detached {
         co_await Schedule();
 #ifdef ORC_FIBER

lib-protocol/source/transport.cpp

@@ -332,7 +332,7 @@ class Middle :
         }
 
         openvpn::TunClient::Ptr new_tun_client_obj(openvpn_io::io_context &context, openvpn::TunClientParent &parent, openvpn::TransportClient *transport) noexcept override {
-            return new Tunnel(middle_, config_, context, parent);
+            return {new Tunnel(middle_, config_, context, parent)};
         }
     };
 
@@ -365,10 +365,12 @@ class Middle :
     }
 
     openvpn::TransportClientFactory *new_transport_factory(const openvpn::ExternalTransport::Config &config) noexcept override {
+        // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
         return new orc::Factory(base_, config);
     }
 
     openvpn::TunClientFactory *new_tun_factory(const openvpn::ExternalTun::Config &config, const openvpn::OptionList &options) noexcept override {
+        // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
         return new Factory(*this, config);
     }
 

lib-shared/source/address.hpp

@@ -36,6 +36,8 @@ class Address :
     private uint160_t
 {
   public:
+    // XXX: this check is false positive here
+    // NOLINTNEXTLINE(modernize-type-traits)
     using uint160_t::uint160_t;
 
     Address(const uint160_t &value) :