fixed static build, dropped unnecessary latest libevent external, other misc

Author: dr7ana

.drone.jsonnet

@@ -384,7 +384,7 @@ local docs_pipeline(name, image, extra_cmds=[], allow_fail=false) = {
         'echo "Building on ${DRONE_STAGE_MACHINE}"',
         apt_get_quiet + ' update',
         apt_get_quiet + ' install -y eatmydata',
-        'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y git clang-format-15 jsonnet',
+        'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y git clang-format-16 jsonnet',
         './contrib/ci/drone-format-verify.sh',
       ],
     }],
@@ -397,8 +397,10 @@ local docs_pipeline(name, image, extra_cmds=[], allow_fail=false) = {
   // Various debian builds
   debian_pipeline('Debian sid (amd64)', docker_base + 'debian-sid'),
   debian_pipeline('Debian sid/Debug (amd64)', docker_base + 'debian-sid', build_type='Debug'),
-  clang(16),
-  full_llvm(16),
+  clang(17),
+  full_llvm(17),
+  clang(19),
+  full_llvm(19),
   debian_pipeline('Debian stable (i386)', docker_base + 'debian-stable/i386'),
   debian_pipeline('Debian bullseye (amd64)',
                   docker_base + 'debian-bullseye',

.gitmodules

@@ -29,6 +29,3 @@
 [submodule "external/oxen-encoding"]
 	path = external/oxen-encoding
 	url = https://github.com/oxen-io/oxen-encoding.git
-[submodule "external/libevent"]
-	path = external/libevent
-	url = https://github.com/libevent/libevent.git

CMakeLists.txt

@@ -271,6 +271,10 @@ target_include_directories(lokinet-base-internal INTERFACE include/lokinet)
 
 target_link_libraries(lokinet-base-internal INTERFACE lokinet-base-internal_warnings)
 
+if (TARGET lokinet_static_deps)
+  target_link_libraries(lokinet-base-internal INTERFACE lokinet_static_deps)
+endif()
+
 if(WITH_SYSTEMD AND (NOT ANDROID))
   if(NOT SD_FOUND)
     message(FATAL_ERROR "libsystemd not found")

cmake/StaticBuild.cmake

@@ -48,11 +48,11 @@ set(ZMQ_SOURCE zeromq-${ZMQ_VERSION}.tar.gz)
 set(ZMQ_HASH SHA512=a71d48aa977ad8941c1609947d8db2679fc7a951e4cd0c3a1127ae026d883c11bd4203cf315de87f95f5031aec459a731aec34e5ce5b667b8d0559b157952541
     CACHE STRING "libzmq source hash")
 
-set(ZLIB_VERSION 1.3 CACHE STRING "zlib version")
+set(ZLIB_VERSION 1.3.1 CACHE STRING "zlib version")
 set(ZLIB_MIRROR ${LOCAL_MIRROR} https://zlib.net
     CACHE STRING "zlib mirror(s)")
 set(ZLIB_SOURCE zlib-${ZLIB_VERSION}.tar.xz)
-set(ZLIB_HASH SHA256=8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7
+set(ZLIB_HASH SHA256=38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32
   CACHE STRING "zlib source hash")
 
 set(CURL_VERSION 7.86.0 CACHE STRING "curl version")
@@ -89,16 +89,22 @@ function(expand_urls output source_file)
   set(${output} "${expanded}" PARENT_SCOPE)
 endfunction()
 
+
+add_library(lokinet_static_deps INTERFACE)
+
 function(add_static_target target ext_target libname)
   add_library(${target} STATIC IMPORTED GLOBAL)
   add_dependencies(${target} ${ext_target})
+  target_link_libraries(lokinet_static_deps INTERFACE ${target})
   set_target_properties(${target} PROPERTIES
     IMPORTED_LOCATION ${DEPS_DESTDIR}/lib/${libname}
   )
+  if (ARGN)
+    target_link_libraries(${target} INTERFACE ${ARGN})
+  endif()
 endfunction()
 
 
-
 set(cross_host "")
 set(cross_rc "")
 if(CMAKE_CROSSCOMPILING)
@@ -357,13 +363,9 @@ set_target_properties(libzmq PROPERTIES
 
 
 #
+# Everything that follows is *only* for lokinet-bootstrap (i.e. if adding new deps put them *above* this).
 #
-#
-# Everything that follows is *only* for lokinet-bootstrap (i.e. if adding new deps put them *above*
-# this).
-#
-#
-#
+
 if(NOT WITH_BOOTSTRAP)
   return()
 endif()

daemon/utils.cpp

@@ -110,39 +110,6 @@ namespace llarp::controller
                 logcat, "Could not find connection ID to RPC bind {} for `session_close` command", src.full_address());
     }
 
-    // bool rpc_controller::_initial_info_request()
-    // {
-    //     int i = 0;
-    //     std::vector<std::promise<bool>> proms{_binds.size()};
-
-    //     for (auto& [b, instance] : _binds)
-    //     {
-    //         _omq->request(instance.cid, "llarp.status", [&, idx = i](bool success, std::vector<std::string> data) {
-    //             if (success)
-    //             {
-    //                 auto res = nlohmann::json::parse(data[0]);
-    //                 instance.rid = res["instance"]["id"].template get<std::string_view>();
-    //                 log::info(logcat, "rid = {}", instance.rid);
-    //                 proms[idx].set_value(true);
-    //             }
-    //             else
-    //             {
-    //                 log::critical(logcat, "RPC call to query initial router status failed!");
-    //                 proms[idx].set_value(false);
-    //             }
-    //         });
-
-    //         i += 1;
-    //     }
-
-    //     bool ret = true;
-
-    //     for (auto& p : proms)
-    //         ret &= p.get_future().get();
-
-    //     return ret;
-    // }
-
     bool rpc_controller::_omq_connect(const std::vector<std::string>& bind_addrs)
     {
         int i = 0;

daemon/utils.hpp

@@ -19,7 +19,6 @@ namespace llarp::controller
 
       private:
         static size_t next_id;
-        // RouterID rid;
 
       public:
         lokinet_instance(omq::ConnectionID c) : ID{++next_id}, cid{std::move(c)} {}
@@ -46,8 +45,6 @@ namespace llarp::controller
         void _status(omq::address src);
         void _close(omq::address src, std::string remote);
 
-        // bool _initial_info_request();
-
         bool _omq_connect(const std::vector<std::string>& bind_addrs);
 
       public:

external/CMakeLists.txt

@@ -26,7 +26,6 @@ if(SUBMODULE_CHECK)
     message(STATUS "Checking submodules")
     check_submodule(CLI11)
     check_submodule(cpr)
-    check_submodule(libevent)
     check_submodule(nlohmann)
     check_submodule(oxen-encoding)
     check_submodule(oxen-libquic)
@@ -51,28 +50,13 @@ macro(system_or_submodule BIGNAME smallname pkgconf subdir)
     message(STATUS "Found system ${smallname} ${${BIGNAME}_VERSION}")
   else()
     message(STATUS "using ${smallname} submodule")
-    add_subdirectory(${subdir})
+    add_subdirectory(${subdir} EXCLUDE_FROM_ALL)
   endif()
   if(NOT TARGET ${smallname}::${smallname})
     add_library(${smallname}::${smallname} ALIAS ${smallname})
   endif()
 endmacro()
 
-# libevent
-set(EVENT__LIBRARY_TYPE "STATIC" CACHE STRING "" FORCE)
-set(EVENT__DISABLE_MBEDTLS ON CACHE BOOL "" FORCE)
-set(EVENT__DISABLE_MBEDTLS ON CACHE BOOL "" FORCE)
-set(EVENT__DISABLE_OPENSSL ON CACHE BOOL "" FORCE)
-set(EVENT__DISABLE_BENCHMARK ON CACHE BOOL "" FORCE)
-set(EVENT__DISABLE_SAMPLES ON CACHE BOOL "" FORCE)
-set(EVENT__DISABLE_TESTS ON CACHE BOOL "" FORCE)
-add_subdirectory(libevent EXCLUDE_FROM_ALL)
-
-add_library(libevent::core ALIAS event_core)
-add_library(libevent::threads ALIAS event_pthreads)
-add_library(libevent::extra ALIAS event_extra)
-
-
 system_or_submodule(OXENC oxenc liboxenc>=1.1.0 oxen-encoding)
 system_or_submodule(OXENMQ oxenmq liboxenmq>=1.2.14 oxen-mq)
 
@@ -102,9 +86,8 @@ if(WITH_PEERSTATS)
 endif()
 
 
-# we get oxen-logging from libquic; forcing submodule ensures fmt>10.0.0
-set(OXEN_LOGGING_FORCE_SUBMODULES ON CACHE INTERNAL "")
-add_subdirectory(oxen-libquic)
+set(LIBQUIC_BUILD_TESTS OFF CACHE BOOL "")
+system_or_submodule(OXENQUIC quic liboxenquic>=1.2.0 oxen-libquic)
 
 
 # cpr configuration.  Ideally we'd just do this via add_subdirectory, but cpr's cmake requires

external/libevent

@@ -262,10 +262,6 @@ target_link_libraries(lokinet-core
 
 target_link_libraries(lokinet-base 
   INTERFACE 
-  
-  libevent::core
-  libevent::threads
-  libevent::extra
 
   Threads::Threads
 

llarp/CMakeLists.txt

@@ -522,7 +522,7 @@ namespace llarp
             ReachableDefault,
             assignment_acceptor(is_reachable),
             Comment{
-                "Determines whether we will pubish our service's ClientContact to the DHT (client default: TRUE)",
+                "Determines whether we will pubish our service's ClientContact to the network (client default: TRUE)",
             });
 
         conf.define_option<int>(

llarp/config/config.cpp

@@ -44,7 +44,8 @@ namespace llarp
 
     void ContactDB::purge_ccs(std::chrono::milliseconds now)
     {
-        log::debug(logcat, "{} called", __PRETTY_FUNCTION__);
+        log::trace(logcat, "{} called", __PRETTY_FUNCTION__);
+        assert(_router.loop()->in_event_loop());
 
         if (_router.is_stopping() || not _router.is_running())
         {

llarp/contact/contactdb.cpp

@@ -2,11 +2,6 @@
 
 #include <oxen/quic.hpp>
 
-extern "C"
-{
-#include <event2/watch.h>
-}
-
 namespace llarp
 {
     using namespace std::chrono_literals;

llarp/ev/types.hpp

@@ -88,8 +88,14 @@ namespace llarp::handlers
 
         if (_cc_publisher)
         {
-            log::trace(logcat, "ClientContact publish ticker stopped!");
             _cc_publisher->stop();
+            log::trace(logcat, "ClientContact publish ticker stopped!");
+        }
+
+        if (_path_rotater)
+        {
+            _path_rotater->stop();
+            log::trace(logcat, "Path rotation ticker stopped!");
         }
 
         if (send_close)
@@ -272,6 +278,10 @@ namespace llarp::handlers
                     },
                     true);
             });
+
+            log::trace(logcat, "Starting path rotation ticker...");
+            _path_rotater =
+                _router.loop()->call_every(path::PATH_ROTATION_INTERVAL, [this]() mutable { rotate_paths(); });
         }
         else
             log::info(logcat, "SessionEndpoint configured to NOT publish ClientContact...");
@@ -473,20 +483,24 @@ namespace llarp::handlers
         _router.loop()->call([this]() mutable {
             log::warning(
                 logcat,
-                "Failed to query enough client introductions from current paths! Building more paths to publish "
-                "introset");
+                "Failed to query enough client intros from current paths! Building more paths to publish contact!");
             return build_more(1);
         });
     }
 
     void SessionEndpoint::update_and_publish_localcc()
     {
-        log::debug(logcat, "Updating and publishing ClientContact...");
-        auto intros = get_current_client_intros();
-        if (intros.empty())
-            return _localcc_update_fail();
-        client_contact.regenerate(std::move(intros));
-        _update_and_publish_localcc();
+        if (should_publish_cc)
+        {
+            log::debug(logcat, "Updating and publishing ClientContact...");
+            auto intros = get_current_client_intros();
+            if (intros.empty())
+                return _localcc_update_fail();
+            client_contact.regenerate(std::move(intros));
+            _update_and_publish_localcc();
+        }
+        else
+            log::warning(logcat, "Local instance not configured to publish ClientContact!");
     }
 
     void SessionEndpoint::_update_and_publish_localcc()