Merge pull request #39 from mpretty-cyro/fix/snode-cache-rebuild-infinite-loop

Fixed a infinite loop, updated libQuic, disabled MTU discovery and C API tweaks

Author: mpretty-cyro

.drone.jsonnet

@@ -397,7 +397,7 @@ local static_build(name,
     ]
   ),
 
-  mac_pipeline('Static macOS', build=[
+  mac_pipeline('Static macOS', arch='arm64', build=[
     'export JOBS=6',
     './utils/macos.sh',
     'cd build-macos && ../utils/ci/drone-static-upload.sh',

CMakeLists.txt

@@ -17,7 +17,7 @@ if(CCACHE_PROGRAM)
 endif()
 
 project(libsession-util
-    VERSION 1.3.0
+    VERSION 1.3.1
     DESCRIPTION "Session client utility library"
     LANGUAGES ${LANGS})
 

external/oxen-libquic

@@ -95,8 +95,8 @@ typedef struct config_string_list {
 
 LIBSESSION_EXPORT config_string_list* config_merge(
         config_object* conf,
-        const char** msg_hashes,
-        const unsigned char** configs,
+        const char* const* msg_hashes,
+        const unsigned char* const* configs,
         const size_t* lengths,
         size_t count) LIBSESSION_WARN_UNUSED;
 

include/session/config/base.h

@@ -333,7 +333,7 @@ LIBSESSION_EXPORT void groups_keys_dump(
 ///   them on failure.
 LIBSESSION_EXPORT bool groups_keys_key_supplement(
         config_group_keys* conf,
-        const char** sids,
+        const char* const* sids,
         size_t sids_len,
         unsigned char** message,
         size_t* message_len);

include/session/config/groups/keys.h

@@ -53,10 +53,10 @@ extern "C" {
 /// responsibility to `free()` this buffer (if non-NULL) when done with it!
 LIBSESSION_EXPORT unsigned char* session_encrypt_for_multiple_simple(
         size_t* out_len,
-        const unsigned char** messages,
+        const unsigned char* const* messages,
         const size_t* message_lengths,
         size_t n_messages,
-        const unsigned char** recipients,
+        const unsigned char* const* recipients,
         size_t n_recipients,
         const unsigned char* x25519_privkey,
         const unsigned char* x25519_pubkey,
@@ -69,10 +69,10 @@ LIBSESSION_EXPORT unsigned char* session_encrypt_for_multiple_simple(
 /// from the Ed25519 key on the fly.
 LIBSESSION_EXPORT unsigned char* session_encrypt_for_multiple_simple_ed25519(
         size_t* out_len,
-        const unsigned char** messages,
+        const unsigned char* const* messages,
         const size_t* message_lengths,
         size_t n_messages,
-        const unsigned char** recipients,
+        const unsigned char* const* recipients,
         size_t n_recipients,
         const unsigned char* ed25519_secret_key,
         const char* domain,

include/session/multi_encrypt.h

@@ -37,8 +37,8 @@ typedef struct network_server_destination {
     const char* endpoint;
     uint16_t port;
     const char* x25519_pubkey;
-    const char** headers;
-    const char** header_values;
+    const char* const* headers;
+    const char* const* header_values;
     size_t headers_size;
 } network_server_destination;
 
@@ -197,8 +197,8 @@ typedef void (*network_onion_response_callback_t)(
         bool success,
         bool timeout,
         int16_t status_code,
-        const char** headers,
-        const char** header_values,
+        const char* const* headers,
+        const char* const* header_values,
         size_t headers_size,
         const char* response,
         size_t response_size,

include/session/network.h

@@ -217,8 +217,8 @@ class Network {
     std::unordered_map<std::string, std::pair<swarm_id_t, std::vector<service_node>>> swarm_cache;
 
     // Snode refresh state
-    int snode_cache_refresh_failure_count;
-    int in_progress_snode_cache_refresh_count;
+    int snode_cache_refresh_failure_count = 0;
+    int in_progress_snode_cache_refresh_count = 0;
     std::optional<std::string> current_snode_cache_refresh_request_id;
     std::vector<std::function<void()>> after_snode_cache_refresh;
     std::optional<std::vector<service_node>> unused_snode_refresh_nodes;

include/session/network.hpp

@@ -764,8 +764,8 @@ LIBSESSION_EXPORT int16_t config_storage_namespace(const config_object* conf) {
 
 LIBSESSION_EXPORT config_string_list* config_merge(
         config_object* conf,
-        const char** msg_hashes,
-        const unsigned char** configs,
+        const char* const* msg_hashes,
+        const unsigned char* const* configs,
         const size_t* lengths,
         size_t count) {
     return wrap_exceptions(conf, [&] {

src/config/base.cpp

@@ -1659,7 +1659,7 @@ LIBSESSION_C_API bool groups_keys_decrypt_message(
 
 LIBSESSION_C_API bool groups_keys_key_supplement(
         config_group_keys* conf,
-        const char** sids,
+        const char* const* sids,
         size_t sids_len,
         unsigned char** message,
         size_t* message_len) {