tmp patch to enlargen the ngc lossy custom pkg size

2023-11-03 14:42:05 +01:00
71 changed files with 121 additions and 425 deletions
--- a/external/solanaceae_toxcore
+++ b/external/solanaceae_toxcore
@ -1 +1 @@
-Subproject commit d05875f489577e9a2c26234810058b41c3236cf7
+Subproject commit f8851c1033514d3ead25f4df1b643a0e5960ecbc
--- a/external/toxcore/CMakeLists.txt
+++ b/external/toxcore/CMakeLists.txt
@ -155,11 +155,6 @@ configure_file(
 	${TOX_DIR}tox/tox_events.h
 	@ONLY
 )
-configure_file(
-	${TOX_DIR}toxcore/tox_private.h
-	${TOX_DIR}tox/tox_private.h
-	@ONLY
-)

 target_include_directories(toxcore PRIVATE "${TOX_DIR}toxcore")
 target_include_directories(toxcore PUBLIC "${TOX_DIR}")
--- a/external/toxcore/c-toxcore/.circleci/bazel-test
+++ b/external/toxcore/c-toxcore/.circleci/bazel-test
@ -4,9 +4,11 @@ set -eux

 git submodule update --init --recursive
 /src/workspace/tools/inject-repo c-toxcore
-# TODO(iphydf): Re-enable fuzz-test when https://github.com/tweag/rules_nixpkgs/issues/442 is fixed.
 cd /src/workspace && bazel test -k \
-  --build_tag_filters=-haskell,-fuzz-test \
-  --test_tag_filters=-haskell,-fuzz-test \
+  --config=remote \
+  --build_tag_filters=-haskell \
+  --test_tag_filters=-haskell \
+  --remote_download_minimal \
  -- \
+  //c-toxcore/... \
  "$@"
--- a/external/toxcore/c-toxcore/.circleci/config.yml
+++ b/external/toxcore/c-toxcore/.circleci/config.yml
@ -7,11 +7,11 @@ workflows:
    jobs:
      # Dynamic analysis in the Bazel build
      - bazel-asan
-      - bazel-msan
      - bazel-tsan
      # Dynamic analysis with CMake
      - asan
      - tsan
+      - msan
      - ubsan
      # Static analysis
      - clang-analyze
@ -29,7 +29,6 @@ jobs:
    steps:
      - checkout
      - run: .circleci/bazel-test
-          //c-toxcore/...

  bazel-tsan:
    working_directory: /tmp/cirrus-ci-build
@ -39,22 +38,11 @@ jobs:
    steps:
      - checkout
      - run: .circleci/bazel-test
-          //c-toxcore/...
          -//c-toxcore/auto_tests:conference_av_test
          -//c-toxcore/auto_tests:conference_test
          -//c-toxcore/auto_tests:onion_test
          -//c-toxcore/auto_tests:tox_many_test

-  bazel-msan:
-    working_directory: /tmp/cirrus-ci-build
-    docker:
-      - image: toxchat/toktok-stack:latest-msan
-
-    steps:
-      - checkout
-      - run: .circleci/bazel-test
-          //c-toxcore/auto_tests:lossless_packet_test
-
  asan:
    working_directory: ~/work
    docker:
@ -103,6 +91,21 @@ jobs:
      - run: git submodule update --init --recursive
      - run: CC=clang .circleci/cmake-ubsan

+  msan:
+    working_directory: ~/work
+    docker:
+      - image: toxchat/toktok-stack:latest-msan
+
+    steps:
+      - checkout
+      - run: git submodule update --init --recursive
+      - run: rm -rf /src/workspace/c-toxcore/* && mv * /src/workspace/c-toxcore/
+      - run:
+          cd /src/workspace && bazel test
+            //c-toxcore/auto_tests:lossless_packet_test
+            //c-toxcore/toxav/...
+            //c-toxcore/toxcore/...
+
  infer:
    working_directory: ~/work
    docker:
--- a/external/toxcore/c-toxcore/.cirrus.yml
+++ b/external/toxcore/c-toxcore/.cirrus.yml
@ -9,9 +9,10 @@ bazel-opt_task:
    - /src/workspace/tools/inject-repo c-toxcore
  test_all_script:
    - cd /src/workspace && bazel test -k
-        --config=ci
+        --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
        --build_tag_filters=-haskell
        --test_tag_filters=-haskell
+        --remote_download_minimal
        --
        //c-toxcore/...
        -//c-toxcore/auto_tests:tcp_relay_test # TODO(robinlinden): Why does this pass locally but not in Cirrus?
@ -26,9 +27,10 @@ bazel-dbg_task:
    - /src/workspace/tools/inject-repo c-toxcore
  test_all_script:
    - cd /src/workspace && bazel test -k
-        --config=ci
+        --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
        --build_tag_filters=-haskell
        --test_tag_filters=-haskell
+        --remote_download_minimal
        --
        //c-toxcore/...
        -//c-toxcore/auto_tests:tcp_relay_test # TODO(robinlinden): Why does this pass locally but not in Cirrus?
@ -43,7 +45,7 @@ cimple_task:
    - /src/workspace/tools/inject-repo c-toxcore
  test_all_script:
    - cd /src/workspace && bazel test -k
-        --config=ci
+        --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
        --build_tag_filters=haskell
        --test_tag_filters=haskell
        --
--- a/external/toxcore/c-toxcore/auto_tests/BUILD.bazel
+++ b/external/toxcore/c-toxcore/auto_tests/BUILD.bazel
@ -29,26 +29,12 @@ flaky_tests = {
    "tox_many_tcp_test": True,
 }

-extra_args = {
-    "proxy_test": ["$(location //c-toxcore/other/proxy)"],
-}
-
-extra_data = {
-    "proxy_test": ["//c-toxcore/other/proxy"],
-}
-
 [cc_test(
    name = src[:-2],
    size = "small",
    srcs = [src],
-    args = ["$(location %s)" % src] + extra_args.get(
-        src[:-2],
-        [],
-    ),
-    data = glob(["data/*"]) + extra_data.get(
-        src[:-2],
-        [],
-    ),
+    args = ["$(location %s)" % src] + ["$(location //c-toxcore/other/proxy)"],
+    data = glob(["data/*"]) + ["//c-toxcore/other/proxy"],
    flaky = flaky_tests.get(
        src[:-2],
        False,
--- a/external/toxcore/c-toxcore/auto_tests/dht_getnodes_api_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/dht_getnodes_api_test.c
@ -122,12 +122,6 @@ static void test_dht_getnodes(AutoTox *autotoxes)

        tox_self_get_dht_id(autotoxes[i].tox, public_key_list[i]);
        tox_callback_dht_get_nodes_response(autotoxes[i].tox, getnodes_response_cb);
-
-        printf("Peer %zu dht closenode count total/annouce-capable: %d/%d\n",
-            i,
-            tox_dht_get_num_closelist(autotoxes[i].tox),
-            tox_dht_get_num_closelist_announce_capable(autotoxes[i].tox)
-        );
    }

    while (!all_nodes_crawled(autotoxes, NUM_TOXES, public_key_list)) {
--- a/external/toxcore/c-toxcore/other/BUILD.bazel
+++ b/external/toxcore/c-toxcore/other/BUILD.bazel
@ -16,7 +16,6 @@ cc_binary(
    testonly = 1,
    srcs = ["DHT_bootstrap.c"],
    deps = [
-        ":bootstrap_node_packets",
        "//c-toxcore/testing:misc_tools",
        "//c-toxcore/toxcore:DHT",
        "//c-toxcore/toxcore:LAN_discovery",
--- a/external/toxcore/c-toxcore/other/DHT_bootstrap.c
+++ b/external/toxcore/c-toxcore/other/DHT_bootstrap.c
@ -31,16 +31,11 @@

 #include "../testing/misc_tools.h"

-#define DHT_NODE_EXTRA_PACKETS
-
 #ifdef DHT_NODE_EXTRA_PACKETS
 #include "./bootstrap_node_packets.h"

-#ifndef DAEMON_VERSION_NUMBER
-#define DAEMON_VERSION_NUMBER (1000000000UL + TOX_VERSION_MAJOR*1000000UL + TOX_VERSION_MINOR*1000UL + TOX_VERSION_PATCH*1UL)
-#endif
-
-static const char *motd_str = ""; //Change this to anything within 256 bytes(but 96 bytes maximum prefered)
+#define DHT_VERSION_NUMBER 1
+#define DHT_MOTD "This is a test motd"
 #endif

 #define PORT 33445
@ -157,7 +152,7 @@ int main(int argc, char *argv[])
    Onion_Announce *onion_a = new_onion_announce(logger, mem, rng, mono_time, dht);

 #ifdef DHT_NODE_EXTRA_PACKETS
-    bootstrap_set_callbacks(dht_get_net(dht), (uint32_t)DAEMON_VERSION_NUMBER, (const uint8_t *) motd_str, strlen(motd_str)+1);
+    bootstrap_set_callbacks(dht_get_net(dht), DHT_VERSION_NUMBER, DHT_MOTD, sizeof(DHT_MOTD));
 #endif

    if (!(onion && forwarding && onion_a)) {
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
@ -1 +1 @@
-b2996d73cab7c7453dc10ccf7ad733622558de3b1ad0db824a379cf96f500379  /usr/local/bin/tox-bootstrapd
+4f5b47978dc26aed78719526f862a44693f821db12f5ff6d70b338d67fb6f784  /usr/local/bin/tox-bootstrapd
--- a/external/toxcore/c-toxcore/other/event_tooling/generate_event_c.cpp
+++ b/external/toxcore/c-toxcore/other/event_tooling/generate_event_c.cpp
@ -306,7 +306,7 @@ void generate_event_impl(const std::string& event_name, std::vector<EventType> e
    f << "    Tox_Event_" << event_name << " *event, Bin_Unpack *bu)\n{\n";
    f << "    assert(event != nullptr);\n";
    if (event_types.size() > 1) {
-        f << "    if (!bin_unpack_array_fixed(bu, " << event_types.size() << ", nullptr)) {\n        return false;\n    }\n\n";
+        f << "    if (!bin_unpack_array_fixed(bu, " << event_types.size() << ")) {\n        return false;\n    }\n\n";
    }

    bool first = true;
--- a/external/toxcore/c-toxcore/testing/fuzzing/BUILD.bazel
+++ b/external/toxcore/c-toxcore/testing/fuzzing/BUILD.bazel
@ -28,7 +28,7 @@ cc_library(

 cc_fuzz_test(
    name = "bootstrap_fuzz_test",
-    size = "small",
+    #size = "small",
    srcs = ["bootstrap_harness.cc"],
    copts = ["-UNDEBUG"],
    corpus = ["//tools/toktok-fuzzer/corpus:bootstrap_fuzzer"],
@ -43,7 +43,7 @@ cc_fuzz_test(

 cc_fuzz_test(
    name = "e2e_fuzz_test",
-    size = "small",
+    #size = "small",
    srcs = ["e2e_fuzz_test.cc"],
    copts = ["-UNDEBUG"],
    corpus = ["//tools/toktok-fuzzer/corpus:e2e_fuzz_test"],
@ -59,7 +59,7 @@ cc_fuzz_test(

 cc_fuzz_test(
    name = "toxsave_fuzz_test",
-    size = "small",
+    #size = "small",
    srcs = ["toxsave_harness.cc"],
    copts = ["-UNDEBUG"],
    corpus = ["//tools/toktok-fuzzer/corpus:toxsave_fuzzer"],
@ -92,7 +92,7 @@ fuzzing_binary(

 cc_fuzz_test(
    name = "protodump_reduce",
-    size = "small",
+    #size = "small",
    srcs = ["protodump_reduce.cc"],
    copts = ["-UNDEBUG"],
    deps = [
--- a/external/toxcore/c-toxcore/testing/fuzzing/fuzz_support.cc
+++ b/external/toxcore/c-toxcore/testing/fuzzing/fuzz_support.cc
@ -22,8 +22,6 @@

 const bool DEBUG = false;

-static constexpr tox_mono_time_cb *get_self_clock = ![](Fuzz_System *self) { return self->clock; };
-
 // TODO(iphydf): Put this somewhere shared.
 struct Network_Addr {
    struct sockaddr_storage addr;
@ -184,7 +182,7 @@ Fuzz_System::Fuzz_System(Fuzz_Data &input)
    }
    , data(input)
 {
-    sys->mono_time_callback = get_self_clock;
+    sys->mono_time_callback = ![](Fuzz_System *self) { return self->clock; };
    sys->mono_time_user_data = this;
    sys->mem = mem.get();
    sys->ns = ns.get();
@ -271,7 +269,7 @@ Null_System::Null_System()
        std::make_unique<Random>(Random{&null_random_funcs, this}),
    }
 {
-    sys->mono_time_callback = get_self_clock;
+    sys->mono_time_callback = ![](Fuzz_System *self) { return self->clock; };
    sys->mono_time_user_data = this;
    sys->mem = mem.get();
    sys->ns = ns.get();
@ -402,7 +400,7 @@ Record_System::Record_System(Global &global, uint64_t seed, const char *name)
    , seed_(seed)
    , name_(name)
 {
-    sys->mono_time_callback = get_self_clock;
+    sys->mono_time_callback = ![](Fuzz_System *self) { return self->clock; };
    sys->mono_time_user_data = this;
    sys->mem = mem.get();
    sys->ns = ns.get();
--- a/external/toxcore/c-toxcore/toxcore/DHT.c
+++ b/external/toxcore/c-toxcore/toxcore/DHT.c
@ -533,8 +533,8 @@ int pack_nodes(const Logger *logger, uint8_t *data, uint16_t length, const Node_

 #ifndef NDEBUG
        const uint32_t increment = ipp_size + CRYPTO_PUBLIC_KEY_SIZE;
-        assert(increment == PACKED_NODE_SIZE_IP4 || increment == PACKED_NODE_SIZE_IP6);
 #endif
+        assert(increment == PACKED_NODE_SIZE_IP4 || increment == PACKED_NODE_SIZE_IP6);
    }

    return packed_length;
@ -565,8 +565,8 @@ int unpack_nodes(Node_format *nodes, uint16_t max_num_nodes, uint16_t *processed

 #ifndef NDEBUG
        const uint32_t increment = ipp_size + CRYPTO_PUBLIC_KEY_SIZE;
-        assert(increment == PACKED_NODE_SIZE_IP4 || increment == PACKED_NODE_SIZE_IP6);
 #endif
+        assert(increment == PACKED_NODE_SIZE_IP4 || increment == PACKED_NODE_SIZE_IP6);
    }

    if (processed_data_len != nullptr) {
@ -2965,34 +2965,6 @@ bool dht_non_lan_connected(const DHT *dht)
    return false;
 }

-uint16_t dht_get_num_closelist(const DHT *dht) {
-    uint16_t num_valid_close_clients = 0;
-    for (uint32_t i = 0; i < LCLIENT_LIST; ++i) {
-        const Client_data *const client = dht_get_close_client(dht, i);
-
-        // check if client is valid
-        if (!(assoc_timeout(dht->cur_time, &client->assoc4) && assoc_timeout(dht->cur_time, &client->assoc6))) {
-            ++num_valid_close_clients;
-        }
-    }
-
-    return num_valid_close_clients;
-}
-
-uint16_t dht_get_num_closelist_announce_capable(const DHT *dht) {
-    uint16_t num_valid_close_clients_with_cap = 0;
-    for (uint32_t i = 0; i < LCLIENT_LIST; ++i) {
-        const Client_data *const client = dht_get_close_client(dht, i);
-
-        // check if client is valid
-        if (!(assoc_timeout(dht->cur_time, &client->assoc4) && assoc_timeout(dht->cur_time, &client->assoc6)) && client->announce_node) {
-            ++num_valid_close_clients_with_cap;
-        }
-    }
-
-    return num_valid_close_clients_with_cap;
-}
-
 unsigned int ipport_self_copy(const DHT *dht, IP_Port *dest)
 {
    ipport_reset(dest);
--- a/external/toxcore/c-toxcore/toxcore/DHT.h
+++ b/external/toxcore/c-toxcore/toxcore/DHT.h
@ -515,24 +515,6 @@ bool dht_isconnected(const DHT *dht);
 non_null()
 bool dht_non_lan_connected(const DHT *dht);

-/**
- * This function returns the ratio of close dht nodes that are known to support announce/store.
- * This function returns the number of DHT nodes in the closelist.
- *
- * @return number
- */
-non_null()
-uint16_t dht_get_num_closelist(const DHT *dht);
-
-/**
- * This function returns the number of DHT nodes in the closelist,
- * that are capable to store annouce data (introduced in version 0.2.18).
- *
- * @return number
- */
-non_null()
-uint16_t dht_get_num_closelist_announce_capable(const DHT *dht);
-
 /** @brief Attempt to add client with ip_port and public_key to the friends client list
 * and close_clientlist.
 *
--- a/external/toxcore/c-toxcore/toxcore/Messenger.c
+++ b/external/toxcore/c-toxcore/toxcore/Messenger.c
@ -2988,7 +2988,6 @@ static State_Load_Status load_nospam_keys(Messenger *m, const uint8_t *data, uin
    load_secret_key(m->net_crypto, data + sizeof(uint32_t) + CRYPTO_PUBLIC_KEY_SIZE);

    if (!pk_equal(data + sizeof(uint32_t), nc_get_self_public_key(m->net_crypto))) {
-        LOGGER_ERROR(m->log, "public key stored in savedata does not match its secret key");
        return STATE_LOAD_STATUS_ERROR;
    }

@ -3220,13 +3219,9 @@ static State_Load_Status groups_load(Messenger *m, const uint8_t *data, uint32_t

        if (group_number < 0) {
            LOGGER_WARNING(m->log, "Failed to load group %u", i);
-            // Can't recover trivially. We may need to skip over some data here.
-            break;
        }
    }

-    LOGGER_DEBUG(m->log, "Successfully loaded %u groups", gc_count_groups(m->group_handler));
-
    bin_unpack_free(bu);

    return STATE_LOAD_STATUS_CONTINUE;
--- a/external/toxcore/c-toxcore/toxcore/bin_unpack.c
+++ b/external/toxcore/c-toxcore/toxcore/bin_unpack.c
@ -73,14 +73,10 @@ bool bin_unpack_array(Bin_Unpack *bu, uint32_t *size)
    return cmp_read_array(&bu->ctx, size) && *size <= bu->bytes_size;
 }

-bool bin_unpack_array_fixed(Bin_Unpack *bu, uint32_t required_size, uint32_t *actual_size)
+bool bin_unpack_array_fixed(Bin_Unpack *bu, uint32_t required_size)
 {
-    uint32_t size = 0;
-    const bool success = cmp_read_array(&bu->ctx, &size) && size == required_size;
-    if (actual_size != nullptr) {
-        *actual_size = size;
-    }
-    return success;
+    uint32_t size;
+    return cmp_read_array(&bu->ctx, &size) && size == required_size;
 }

 bool bin_unpack_bool(Bin_Unpack *bu, bool *val)
@ -132,18 +128,6 @@ bool bin_unpack_bin(Bin_Unpack *bu, uint8_t **data_ptr, uint32_t *data_length_pt
    return true;
 }

-bool bin_unpack_bin_max(Bin_Unpack *bu, uint8_t *data, uint16_t *data_length_ptr, uint16_t max_data_length)
-{
-    uint32_t bin_size;
-    if (!bin_unpack_bin_size(bu, &bin_size) || bin_size > max_data_length) {
-        return false;
-    }
-
-    *data_length_ptr = bin_size;
-
-    return bin_unpack_bin_b(bu, data, bin_size);
-}
-
 bool bin_unpack_bin_fixed(Bin_Unpack *bu, uint8_t *data, uint32_t data_length)
 {
    uint32_t bin_size;
--- a/external/toxcore/c-toxcore/toxcore/bin_unpack.h
+++ b/external/toxcore/c-toxcore/toxcore/bin_unpack.h
@ -45,14 +45,10 @@ void bin_unpack_free(Bin_Unpack *bu);
 non_null() bool bin_unpack_array(Bin_Unpack *bu, uint32_t *size);

 /** @brief Start unpacking a fixed size MessagePack array.
- *
- * Fails if the array size is not the required size. If `actual_size` is passed a non-null
- * pointer, the array size is written there.
 *
 * @retval false if the packed array size is not exactly the required size.
 */
-non_null(1) nullable(3)
-bool bin_unpack_array_fixed(Bin_Unpack *bu, uint32_t required_size, uint32_t *actual_size);
+non_null() bool bin_unpack_array_fixed(Bin_Unpack *bu, uint32_t required_size);

 /** @brief Unpack a MessagePack bool. */
 non_null() bool bin_unpack_bool(Bin_Unpack *bu, bool *val);
@ -75,16 +71,10 @@ non_null() bool bin_unpack_nil(Bin_Unpack *bu);
 * large allocation unless the input array was already that large.
 */
 non_null() bool bin_unpack_bin(Bin_Unpack *bu, uint8_t **data_ptr, uint32_t *data_length_ptr);
-/** @brief Unpack a variable size MessagePack bin into a fixed size byte array.
- *
- * Stores unpacked data into `data` with its length stored in `data_length_ptr`. This function does
- * not allocate memory and requires that `max_data_length` is less than or equal to `sizeof(arr)`
- * when `arr` is passed as `data` pointer.
- */
-non_null() bool bin_unpack_bin_max(Bin_Unpack *bu, uint8_t *data, uint16_t *data_length_ptr, uint16_t max_data_length);
 /** @brief Unpack a MessagePack bin of a fixed length into a pre-allocated byte array.
 *
- * Similar to the function above, but doesn't output the data length.
+ * Unlike the function above, this function does not allocate any memory, but requires the size to
+ * be known up front.
 */
 non_null() bool bin_unpack_bin_fixed(Bin_Unpack *bu, uint8_t *data, uint32_t data_length);

--- a/external/toxcore/c-toxcore/toxcore/events/conference_invite.c
+++ b/external/toxcore/c-toxcore/toxcore/events/conference_invite.c
@ -120,7 +120,7 @@ static bool tox_event_conference_invite_unpack(
    Tox_Event_Conference_Invite *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/conference_message.c
+++ b/external/toxcore/c-toxcore/toxcore/events/conference_message.c
@ -135,7 +135,7 @@ static bool tox_event_conference_message_unpack(
    Tox_Event_Conference_Message *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 4, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 4)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/conference_peer_name.c
+++ b/external/toxcore/c-toxcore/toxcore/events/conference_peer_name.c
@ -120,7 +120,7 @@ static bool tox_event_conference_peer_name_unpack(
    Tox_Event_Conference_Peer_Name *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/conference_title.c
+++ b/external/toxcore/c-toxcore/toxcore/events/conference_title.c
@ -119,7 +119,7 @@ static bool tox_event_conference_title_unpack(
    Tox_Event_Conference_Title *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/file_chunk_request.c
+++ b/external/toxcore/c-toxcore/toxcore/events/file_chunk_request.c
@ -112,7 +112,7 @@ static bool tox_event_file_chunk_request_unpack(
    Tox_Event_File_Chunk_Request *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 4, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 4)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/file_recv.c
+++ b/external/toxcore/c-toxcore/toxcore/events/file_recv.c
@ -149,7 +149,7 @@ static bool tox_event_file_recv_unpack(
    Tox_Event_File_Recv *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 5, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 5)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/file_recv_chunk.c
+++ b/external/toxcore/c-toxcore/toxcore/events/file_recv_chunk.c
@ -134,7 +134,7 @@ static bool tox_event_file_recv_chunk_unpack(
    Tox_Event_File_Recv_Chunk *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 4, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 4)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/file_recv_control.c
+++ b/external/toxcore/c-toxcore/toxcore/events/file_recv_control.c
@ -99,7 +99,7 @@ static bool tox_event_file_recv_control_unpack(
    Tox_Event_File_Recv_Control *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_connection_status.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_connection_status.c
@ -86,7 +86,7 @@ static bool tox_event_friend_connection_status_unpack(
    Tox_Event_Friend_Connection_Status *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_lossless_packet.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_lossless_packet.c
@ -105,7 +105,7 @@ static bool tox_event_friend_lossless_packet_unpack(
    Tox_Event_Friend_Lossless_Packet *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_lossy_packet.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_lossy_packet.c
@ -104,7 +104,7 @@ static bool tox_event_friend_lossy_packet_unpack(
    Tox_Event_Friend_Lossy_Packet *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_message.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_message.c
@ -119,7 +119,7 @@ static bool tox_event_friend_message_unpack(
    Tox_Event_Friend_Message *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_name.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_name.c
@ -104,7 +104,7 @@ static bool tox_event_friend_name_unpack(
    Tox_Event_Friend_Name *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_read_receipt.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_read_receipt.c
@ -83,7 +83,7 @@ static bool tox_event_friend_read_receipt_unpack(
    Tox_Event_Friend_Read_Receipt *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_request.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_request.c
@ -105,7 +105,7 @@ static bool tox_event_friend_request_unpack(
    Tox_Event_Friend_Request *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_status.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_status.c
@ -84,7 +84,7 @@ static bool tox_event_friend_status_unpack(
    Tox_Event_Friend_Status *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_status_message.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_status_message.c
@ -106,7 +106,7 @@ static bool tox_event_friend_status_message_unpack(
    Tox_Event_Friend_Status_Message *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/friend_typing.c
+++ b/external/toxcore/c-toxcore/toxcore/events/friend_typing.c
@ -82,7 +82,7 @@ static bool tox_event_friend_typing_unpack(
    Tox_Event_Friend_Typing *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_custom_packet.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_custom_packet.c
@ -120,7 +120,7 @@ static bool tox_event_group_custom_packet_unpack(
    Tox_Event_Group_Custom_Packet *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_custom_private_packet.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_custom_private_packet.c
@ -120,7 +120,7 @@ static bool tox_event_group_custom_private_packet_unpack(
    Tox_Event_Group_Custom_Private_Packet *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_invite.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_invite.c
@ -142,7 +142,7 @@ static bool tox_event_group_invite_unpack(
    Tox_Event_Group_Invite *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_join_fail.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_join_fail.c
@ -84,7 +84,7 @@ static bool tox_event_group_join_fail_unpack(
    Tox_Event_Group_Join_Fail *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_message.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_message.c
@ -150,7 +150,7 @@ static bool tox_event_group_message_unpack(
    Tox_Event_Group_Message *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 5, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 5)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_moderation.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_moderation.c
@ -114,7 +114,7 @@ static bool tox_event_group_moderation_unpack(
    Tox_Event_Group_Moderation *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 4, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 4)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_password.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_password.c
@ -105,7 +105,7 @@ static bool tox_event_group_password_unpack(
    Tox_Event_Group_Password *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_peer_exit.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_exit.c
@ -172,7 +172,7 @@ static bool tox_event_group_peer_exit_unpack(
    Tox_Event_Group_Peer_Exit *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 5, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 5)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_peer_join.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_join.c
@ -84,7 +84,7 @@ static bool tox_event_group_peer_join_unpack(
    Tox_Event_Group_Peer_Join *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_peer_limit.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_limit.c
@ -84,7 +84,7 @@ static bool tox_event_group_peer_limit_unpack(
    Tox_Event_Group_Peer_Limit *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_peer_name.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_name.c
@ -120,7 +120,7 @@ static bool tox_event_group_peer_name_unpack(
    Tox_Event_Group_Peer_Name *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_peer_status.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_status.c
@ -99,7 +99,7 @@ static bool tox_event_group_peer_status_unpack(
    Tox_Event_Group_Peer_Status *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_privacy_state.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_privacy_state.c
@ -84,7 +84,7 @@ static bool tox_event_group_privacy_state_unpack(
    Tox_Event_Group_Privacy_State *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_private_message.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_private_message.c
@ -135,7 +135,7 @@ static bool tox_event_group_private_message_unpack(
    Tox_Event_Group_Private_Message *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 4, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 4)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_topic.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_topic.c
@ -120,7 +120,7 @@ static bool tox_event_group_topic_unpack(
    Tox_Event_Group_Topic *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 3)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_topic_lock.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_topic_lock.c
@ -84,7 +84,7 @@ static bool tox_event_group_topic_lock_unpack(
    Tox_Event_Group_Topic_Lock *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/events/group_voice_state.c
+++ b/external/toxcore/c-toxcore/toxcore/events/group_voice_state.c
@ -84,7 +84,7 @@ static bool tox_event_group_voice_state_unpack(
    Tox_Event_Group_Voice_State *event, Bin_Unpack *bu)
 {
    assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/group.c
+++ b/external/toxcore/c-toxcore/toxcore/group.c
@ -802,7 +802,6 @@ static int addpeer(Group_Chats *g_c, uint32_t groupnumber, const uint8_t *real_p

    if (peer_index != -1) {
        if (!pk_equal(g->group[peer_index].real_pk, real_pk)) {
-            LOGGER_ERROR(g_c->m->log, "peer public key is incorrect for peer %d", peer_number);
            return -1;
        }

@ -3680,7 +3679,6 @@ static State_Load_Status load_conferences_helper(Group_Chats *g_c, const uint8_t

        if (groupnumber == -1) {
            // If this fails there's a serious problem, don't bother with cleanup
-            LOGGER_ERROR(g_c->m->log, "conference creation failed");
            return STATE_LOAD_STATUS_ERROR;
        }

@ -3698,7 +3696,6 @@ static State_Load_Status load_conferences_helper(Group_Chats *g_c, const uint8_t
                assert(ret);
            }

-            LOGGER_ERROR(g_c->m->log, "conference loading failed");
            return STATE_LOAD_STATUS_ERROR;
        }

@ -3708,7 +3705,6 @@ static State_Load_Status load_conferences_helper(Group_Chats *g_c, const uint8_t
                                       nullptr, true, false);

        if (peer_index == -1) {
-            LOGGER_ERROR(g_c->m->log, "adding peer %d failed", g->peer_number);
            return STATE_LOAD_STATUS_ERROR;
        }

--- a/external/toxcore/c-toxcore/toxcore/group_chats.c
+++ b/external/toxcore/c-toxcore/toxcore/group_chats.c
@ -108,19 +108,10 @@ static_assert(GCC_BUFFER_SIZE <= UINT16_MAX,
 static_assert(MAX_GC_PACKET_CHUNK_SIZE < MAX_GC_PACKET_SIZE,
              "MAX_GC_PACKET_CHUNK_SIZE must be < MAX_GC_PACKET_SIZE");

-static_assert(MAX_GC_PACKET_INCOMING_CHUNK_SIZE < MAX_GC_PACKET_SIZE,
-              "MAX_GC_PACKET_INCOMING_CHUNK_SIZE must be < MAX_GC_PACKET_SIZE");
-
-static_assert(MAX_GC_PACKET_INCOMING_CHUNK_SIZE >= MAX_GC_PACKET_CHUNK_SIZE,
-              "MAX_GC_PACKET_INCOMING_CHUNK_SIZE must be >= MAX_GC_PACKET_CHUNK_SIZE");
-
 // size of a lossless handshake packet - lossless packets can't/shouldn't be split up
 static_assert(MAX_GC_PACKET_CHUNK_SIZE >= 171,
              "MAX_GC_PACKET_CHUNK_SIZE must be >= 171");

-static_assert(MAX_GC_PACKET_INCOMING_CHUNK_SIZE >= 171,
-              "MAX_GC_PACKET_INCOMING_CHUNK_SIZE must be >= 171");
-
 // group_moderation constants assume this is the max packet size.
 static_assert(MAX_GC_PACKET_SIZE >= 50000,
              "MAX_GC_PACKET_SIZE doesn't match constants in group_moderation.h");
@ -128,9 +119,6 @@ static_assert(MAX_GC_PACKET_SIZE >= 50000,
 static_assert(MAX_GC_PACKET_SIZE <= UINT16_MAX - MAX_GC_PACKET_CHUNK_SIZE,
              "MAX_GC_PACKET_SIZE must be <= UINT16_MAX - MAX_GC_PACKET_CHUNK_SIZE");

-static_assert(MAX_GC_PACKET_SIZE <= UINT16_MAX - MAX_GC_PACKET_INCOMING_CHUNK_SIZE,
-              "MAX_GC_PACKET_SIZE must be <= UINT16_MAX - MAX_GC_PACKET_INCOMING_CHUNK_SIZE");
-
 /** Types of broadcast messages. */
 typedef enum Group_Message_Type {
    GC_MESSAGE_TYPE_NORMAL = 0x00,
@ -6282,13 +6270,13 @@ static int handle_gc_tcp_packet(void *object, int id, const uint8_t *packet, uin

    if (length <= MIN_TCP_PACKET_SIZE) {
        LOGGER_WARNING(m->log, "Got tcp packet with invalid length: %u (expected %u to %u)", length,
-                       MIN_TCP_PACKET_SIZE, MAX_GC_PACKET_INCOMING_CHUNK_SIZE + MIN_TCP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
+                       MIN_TCP_PACKET_SIZE, MAX_GC_PACKET_CHUNK_SIZE + MIN_TCP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
        return -1;
    }

-    if (length > MAX_GC_PACKET_INCOMING_CHUNK_SIZE + MIN_TCP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE) {
+    if (length > MAX_GC_PACKET_CHUNK_SIZE + MIN_TCP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE) {
        LOGGER_WARNING(m->log, "Got tcp packet with invalid length: %u (expected %u to %u)", length,
-                       MIN_TCP_PACKET_SIZE, MAX_GC_PACKET_INCOMING_CHUNK_SIZE + MIN_TCP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
+                       MIN_TCP_PACKET_SIZE, MAX_GC_PACKET_CHUNK_SIZE + MIN_TCP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
        return -1;
    }

@ -6363,13 +6351,13 @@ static int handle_gc_tcp_oob_packet(void *object, const uint8_t *public_key, uns

    if (length <= GC_MIN_HS_PACKET_PAYLOAD_SIZE) {
        LOGGER_WARNING(m->log, "Got tcp oob packet with invalid length: %u (expected %u to %u)", length,
-                       GC_MIN_HS_PACKET_PAYLOAD_SIZE, MAX_GC_PACKET_INCOMING_CHUNK_SIZE + CRYPTO_MAC_SIZE + CRYPTO_NONCE_SIZE);
+                       GC_MIN_HS_PACKET_PAYLOAD_SIZE, MAX_GC_PACKET_CHUNK_SIZE + CRYPTO_MAC_SIZE + CRYPTO_NONCE_SIZE);
        return -1;
    }

-    if (length > MAX_GC_PACKET_INCOMING_CHUNK_SIZE + CRYPTO_MAC_SIZE + CRYPTO_NONCE_SIZE) {
+    if (length > MAX_GC_PACKET_CHUNK_SIZE + CRYPTO_MAC_SIZE + CRYPTO_NONCE_SIZE) {
        LOGGER_WARNING(m->log, "Got tcp oob packet with invalid length: %u (expected %u to %u)", length,
-                       GC_MIN_HS_PACKET_PAYLOAD_SIZE, MAX_GC_PACKET_INCOMING_CHUNK_SIZE + CRYPTO_MAC_SIZE + CRYPTO_NONCE_SIZE);
+                       GC_MIN_HS_PACKET_PAYLOAD_SIZE, MAX_GC_PACKET_CHUNK_SIZE + CRYPTO_MAC_SIZE + CRYPTO_NONCE_SIZE);
        return -1;
    }

@ -6419,13 +6407,13 @@ static int handle_gc_udp_packet(void *object, const IP_Port *ipp, const uint8_t

    if (length <= MIN_UDP_PACKET_SIZE) {
        LOGGER_WARNING(m->log, "Got UDP packet with invalid length: %u (expected %u to %u)", length,
-                       MIN_UDP_PACKET_SIZE, MAX_GC_PACKET_INCOMING_CHUNK_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
+                       MIN_UDP_PACKET_SIZE, MAX_GC_CUSTOM_LOSSY_PACKET_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
        return -1;
    }

-    if (length > MAX_GC_PACKET_INCOMING_CHUNK_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE) {
+    if (length > MAX_GC_CUSTOM_LOSSY_PACKET_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE) {
        LOGGER_WARNING(m->log, "Got UDP packet with invalid length: %u (expected %u to %u)", length,
-                       MIN_UDP_PACKET_SIZE, MAX_GC_PACKET_INCOMING_CHUNK_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
+                       MIN_UDP_PACKET_SIZE, MAX_GC_CUSTOM_LOSSY_PACKET_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
        return -1;
    }

@ -6988,12 +6976,12 @@ static bool ping_peer(const GC_Chat *chat, const GC_Connection *gconn)

    if (!send_lossy_group_packet(chat, gconn, data, packed_len, GP_PING)) {
        free(data);
-        return false;
+        return true;
    }

    free(data);

-    return true;
+    return false;
 }

 /**
--- a/external/toxcore/c-toxcore/toxcore/group_common.h
+++ b/external/toxcore/c-toxcore/toxcore/group_common.h
@ -28,8 +28,6 @@
 * For an explanation on why this value was chosen, see the following link: https://archive.ph/vsCOG
 */
 #define MAX_GC_PACKET_CHUNK_SIZE 500
-/* Max size of an incoming packet chunk that is allowed */
-#define MAX_GC_PACKET_INCOMING_CHUNK_SIZE 1372

 #define MAX_GC_MESSAGE_SIZE GROUP_MAX_MESSAGE_LENGTH
 #define MAX_GC_MESSAGE_RAW_SIZE (MAX_GC_MESSAGE_SIZE + GC_MESSAGE_PSEUDO_ID_SIZE)
--- a/external/toxcore/c-toxcore/toxcore/group_connection.c
+++ b/external/toxcore/c-toxcore/toxcore/group_connection.c
@ -366,7 +366,7 @@ static uint16_t reassemble_packet(const Logger *log, GC_Connection *gconn, uint8
    // search backwards in recv array until we find an empty slot or a non-fragment packet type
    while (!array_entry_is_empty(entry) && entry->packet_type == GP_FRAGMENT) {
        assert(entry->data != nullptr);
-        assert(entry->data_length <= MAX_GC_PACKET_INCOMING_CHUNK_SIZE);
+        assert(entry->data_length <= MAX_GC_PACKET_CHUNK_SIZE);

        const uint16_t diff = packet_length + entry->data_length;

--- a/external/toxcore/c-toxcore/toxcore/group_pack.c
+++ b/external/toxcore/c-toxcore/toxcore/group_pack.c
@ -22,7 +22,7 @@
 non_null()
 static bool load_unpack_state_values(GC_Chat *chat, Bin_Unpack *bu)
 {
-    if (!bin_unpack_array_fixed(bu, 8, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 8)) {
        LOGGER_ERROR(chat->log, "Group state values array malformed");
        return false;
    }
@ -58,23 +58,15 @@ static bool load_unpack_state_values(GC_Chat *chat, Bin_Unpack *bu)
 non_null()
 static bool load_unpack_state_bin(GC_Chat *chat, Bin_Unpack *bu)
 {
-    if (!bin_unpack_array_fixed(bu, 5, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 5)) {
        LOGGER_ERROR(chat->log, "Group state binary array malformed");
        return false;
    }

-    if (!bin_unpack_bin_fixed(bu, chat->shared_state_sig, SIGNATURE_SIZE)) {
-        LOGGER_ERROR(chat->log, "Failed to unpack shared state signature");
-        return false;
-    }
-
-    if (!bin_unpack_bin_fixed(bu, chat->shared_state.founder_public_key, EXT_PUBLIC_KEY_SIZE)) {
-        LOGGER_ERROR(chat->log, "Failed to unpack founder public key");
-        return false;
-    }
-
-    if (!(bin_unpack_bin_max(bu, chat->shared_state.group_name, &chat->shared_state.group_name_len, sizeof(chat->shared_state.group_name))
-            && bin_unpack_bin_max(bu, chat->shared_state.password, &chat->shared_state.password_length, sizeof(chat->shared_state.password))
+    if (!(bin_unpack_bin_fixed(bu, chat->shared_state_sig, SIGNATURE_SIZE)
+            && bin_unpack_bin_fixed(bu, chat->shared_state.founder_public_key, EXT_PUBLIC_KEY_SIZE)
+            && bin_unpack_bin_fixed(bu, chat->shared_state.group_name, chat->shared_state.group_name_len)
+            && bin_unpack_bin_fixed(bu, chat->shared_state.password, chat->shared_state.password_length)
            && bin_unpack_bin_fixed(bu, chat->shared_state.mod_list_hash, MOD_MODERATION_HASH_SIZE))) {
        LOGGER_ERROR(chat->log, "Failed to unpack state binary data");
        return false;
@ -86,7 +78,7 @@ static bool load_unpack_state_bin(GC_Chat *chat, Bin_Unpack *bu)
 non_null()
 static bool load_unpack_topic_info(GC_Chat *chat, Bin_Unpack *bu)
 {
-    if (!bin_unpack_array_fixed(bu, 6, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 6)) {
        LOGGER_ERROR(chat->log, "Group topic array malformed");
        return false;
    }
@ -94,7 +86,7 @@ static bool load_unpack_topic_info(GC_Chat *chat, Bin_Unpack *bu)
    if (!(bin_unpack_u32(bu, &chat->topic_info.version)
            && bin_unpack_u16(bu, &chat->topic_info.length)
            && bin_unpack_u16(bu, &chat->topic_info.checksum)
-            && bin_unpack_bin_max(bu, chat->topic_info.topic, &chat->topic_info.length, sizeof(chat->topic_info.topic))
+            && bin_unpack_bin_fixed(bu, chat->topic_info.topic, chat->topic_info.length)
            && bin_unpack_bin_fixed(bu, chat->topic_info.public_sig_key, SIG_PUBLIC_KEY_SIZE)
            && bin_unpack_bin_fixed(bu, chat->topic_sig, SIGNATURE_SIZE))) {
        LOGGER_ERROR(chat->log, "Failed to unpack topic info");
@ -107,9 +99,8 @@ static bool load_unpack_topic_info(GC_Chat *chat, Bin_Unpack *bu)
 non_null()
 static bool load_unpack_mod_list(GC_Chat *chat, Bin_Unpack *bu)
 {
-    uint32_t actual_size = 0;
-    if (!bin_unpack_array_fixed(bu, 2, &actual_size)) {
-        LOGGER_ERROR(chat->log, "Group mod list array malformed: %d != 2", actual_size);
+    if (!bin_unpack_array_fixed(bu, 2)) {
+        LOGGER_ERROR(chat->log, "Group mod list array malformed");
        return false;
    }

@ -157,7 +148,7 @@ static bool load_unpack_mod_list(GC_Chat *chat, Bin_Unpack *bu)
 non_null()
 static bool load_unpack_keys(GC_Chat *chat, Bin_Unpack *bu)
 {
-    if (!bin_unpack_array_fixed(bu, 4, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 4)) {
        LOGGER_ERROR(chat->log, "Group keys array malformed");
        return false;
    }
@ -176,7 +167,7 @@ static bool load_unpack_keys(GC_Chat *chat, Bin_Unpack *bu)
 non_null()
 static bool load_unpack_self_info(GC_Chat *chat, Bin_Unpack *bu)
 {
-    if (!bin_unpack_array_fixed(bu, 4, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 4)) {
        LOGGER_ERROR(chat->log, "Group self info array malformed");
        return false;
    }
@ -223,7 +214,7 @@ static bool load_unpack_self_info(GC_Chat *chat, Bin_Unpack *bu)
 non_null()
 static bool load_unpack_saved_peers(GC_Chat *chat, Bin_Unpack *bu)
 {
-    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
+    if (!bin_unpack_array_fixed(bu, 2)) {
        LOGGER_ERROR(chat->log, "Group saved peers array malformed");
        return false;
    }
@ -265,9 +256,8 @@ static bool load_unpack_saved_peers(GC_Chat *chat, Bin_Unpack *bu)

 bool gc_load_unpack_group(GC_Chat *chat, Bin_Unpack *bu)
 {
-    uint32_t actual_size;
-    if (!bin_unpack_array_fixed(bu, 7, &actual_size)) {
-        LOGGER_ERROR(chat->log, "Group info array malformed: %d != 7", actual_size);
+    if (!bin_unpack_array_fixed(bu, 7)) {
+        LOGGER_ERROR(chat->log, "Group info array malformed");
        return false;
    }

--- a/external/toxcore/c-toxcore/toxcore/network.c
+++ b/external/toxcore/c-toxcore/toxcore/network.c
@ -1086,7 +1086,7 @@ void networking_poll(const Networking_Core *net, void *userdata)
    }

    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE] = {0};
+    uint8_t data[MAX_UDP_PACKET_SIZE];
    uint32_t length;

    while (receivepacket(net->ns, net->mem, net->log, net->sock, &ip_port, data, &length) != -1) {
--- a/external/toxcore/c-toxcore/toxcore/state.c
+++ b/external/toxcore/c-toxcore/toxcore/state.c
@ -52,7 +52,7 @@ int state_load(const Logger *log, state_load_cb *state_load_callback, void *oute
            }

            case STATE_LOAD_STATUS_ERROR: {
-                LOGGER_ERROR(log, "Error occcured in state file (type: 0x%02x).", type);
+                LOGGER_ERROR(log, "Error occcured in state file (type: %u).", type);
                return -1;
            }

--- a/external/toxcore/c-toxcore/toxcore/tox.c
+++ b/external/toxcore/c-toxcore/toxcore/tox.c
@ -858,26 +858,12 @@ Tox *tox_new(const struct Tox_Options *options, Tox_Err_New *error)

    if (load_savedata_tox
            && tox_load(tox, tox_options_get_savedata_data(opts), tox_options_get_savedata_length(opts)) == -1) {
-        kill_groupchats(tox->m->conferences_object);
-        kill_messenger(tox->m);
-
-        mono_time_free(tox->sys.mem, tox->mono_time);
-        tox_options_free(default_options);
-        tox_unlock(tox);
-
-        if (tox->mutex != nullptr) {
-            pthread_mutex_destroy(tox->mutex);
-        }
-
-        mem_delete(sys->mem, tox->mutex);
-        mem_delete(sys->mem, tox);
-
        SET_ERROR_PARAMETER(error, TOX_ERR_NEW_LOAD_BAD_FORMAT);
-        return nullptr;
-    }
-
-    if (load_savedata_sk) {
+    } else if (load_savedata_sk) {
        load_secret_key(tox->m->net_crypto, tox_options_get_savedata_data(opts));
+        SET_ERROR_PARAMETER(error, TOX_ERR_NEW_OK);
+    } else {
+        SET_ERROR_PARAMETER(error, TOX_ERR_NEW_OK);
    }

    m_callback_namechange(tox->m, tox_friend_name_handler);
@ -927,9 +913,6 @@ Tox *tox_new(const struct Tox_Options *options, Tox_Err_New *error)
    tox_options_free(default_options);

    tox_unlock(tox);
-
-    SET_ERROR_PARAMETER(error, TOX_ERR_NEW_OK);
-
    return tox;
 }

--- a/external/toxcore/c-toxcore/toxcore/tox.h
+++ b/external/toxcore/c-toxcore/toxcore/tox.h
@ -890,6 +890,9 @@ typedef enum Tox_Err_New {
 * This function will bring the instance into a valid state. Running the event
 * loop with a new instance will operate correctly.
 *
+ * If loading failed or succeeded only partially, the new or partially loaded
+ * instance is returned and an error code is set.
+ *
 * @param options An options object as described above. If this parameter is
 *   NULL, the default options are used.
 *
--- a/external/toxcore/c-toxcore/toxcore/tox_private.c
+++ b/external/toxcore/c-toxcore/toxcore/tox_private.c
@ -149,20 +149,3 @@ bool tox_dht_get_nodes(const Tox *tox, const uint8_t *public_key, const char *ip

    return true;
 }
-
-uint16_t tox_dht_get_num_closelist(const Tox *tox) {
-    tox_lock(tox);
-    const uint16_t num_total = dht_get_num_closelist(tox->m->dht);
-    tox_unlock(tox);
-
-    return num_total;
-}
-
-uint16_t tox_dht_get_num_closelist_announce_capable(const Tox *tox){
-    tox_lock(tox);
-    const uint16_t num_cap = dht_get_num_closelist_announce_capable(tox->m->dht);
-    tox_unlock(tox);
-
-    return num_cap;
-}
-
--- a/external/toxcore/c-toxcore/toxcore/tox_private.h
+++ b/external/toxcore/c-toxcore/toxcore/tox_private.h
@ -140,22 +140,6 @@ typedef enum Tox_Err_Dht_Get_Nodes {
 bool tox_dht_get_nodes(const Tox *tox, const uint8_t *public_key, const char *ip, uint16_t port,
                       const uint8_t *target_public_key, Tox_Err_Dht_Get_Nodes *error);

-/**
- * This function returns the ratio of close dht nodes that are known to support announce/store.
- * This function returns the number of DHT nodes in the closelist.
- *
- * @return number
- */
-uint16_t tox_dht_get_num_closelist(const Tox *tox);
-
-/**
- * This function returns the number of DHT nodes in the closelist,
- * that are capable to store annouce data (introduced in version 0.2.18).
- *
- * @return number
- */
-uint16_t tox_dht_get_num_closelist_announce_capable(const Tox *tox);
-
 #ifdef __cplusplus
 }
 #endif
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -58,9 +58,6 @@ add_executable(tomato
 	./tox_ui_utils.hpp
 	./tox_ui_utils.cpp

-	./tox_dht_cap_histo.hpp
-	./tox_dht_cap_histo.cpp
-
 	./chat_gui4.hpp
 	./chat_gui4.cpp
 )
--- a/src/main_screen.cpp
+++ b/src/main_screen.cpp
@ -11,7 +11,6 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
 	rmm(cr),
 	mts(rmm),
 	tc(save_path, save_password),
-	tpi(tc.getTox()),
 	ad(tc),
 	tcm(cr, tc, tc),
 	tmm(rmm, cr, tcm, tc, tc),
@ -21,8 +20,7 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
 	sdlrtu(renderer_),
 	cg(conf, rmm, cr, sdlrtu),
 	sw(conf),
-	tuiu(tc, conf),
-	tdch(tpi)
+	tuiu(tc, conf)
 {
 	tel.subscribeAll(tc);

@ -46,7 +44,6 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
 		g_provideInstance<RegistryMessageModel>("RegistryMessageModel", "host", &rmm);

 		g_provideInstance<ToxI>("ToxI", "host", &tc);
-		g_provideInstance<ToxPrivateI>("ToxPrivateI", "host", &tpi);
 		g_provideInstance<ToxEventProviderI>("ToxEventProviderI", "host", &tc);
 		g_provideInstance<ToxContactModel2>("ToxContactModel2", "host", &tcm);

@ -110,14 +107,12 @@ Screen* MainScreen::poll(bool& quit) {
 	}

 	pm.tick(time_delta);
-	tdch.tick(time_delta);

 	mts.iterate();

 	cg.render();
 	sw.render();
 	tuiu.render();
-	tdch.render();

 	if constexpr (false) {
 		ImGui::ShowDemoWindow();
--- a/src/main_screen.hpp
+++ b/src/main_screen.hpp
@ -8,7 +8,6 @@
 #include <solanaceae/message3/message_time_sort.hpp>
 #include <solanaceae/plugin/plugin_manager.hpp>
 #include <solanaceae/toxcore/tox_event_logger.hpp>
-#include "./tox_private_impl.hpp"

 #include <solanaceae/tox_contacts/tox_contact_model2.hpp>
 #include <solanaceae/tox_messages/tox_message_manager.hpp>
@ -24,7 +23,6 @@
 #include "./chat_gui4.hpp"
 #include "./settings_window.hpp"
 #include "./tox_ui_utils.hpp"
-#include "./tox_dht_cap_histo.hpp"

 #include <string>
 #include <iostream>
@ -49,7 +47,6 @@ struct MainScreen final : public Screen {

 	ToxEventLogger tel{std::cout};
 	ToxClient tc;
-	ToxPrivateImpl tpi;
 	AutoDirty ad;
 	ToxContactModel2 tcm;
 	ToxMessageManager tmm;
@ -64,7 +61,6 @@ struct MainScreen final : public Screen {
 	ChatGui4 cg;
 	SettingsWindow sw;
 	ToxUIUtils tuiu;
-	ToxDHTCapHisto tdch;

 	MainScreen(SDL_Renderer* renderer_, std::string save_path, std::string save_password, std::vector<std::string> plugins);
 	~MainScreen(void);
--- a/src/tox_dht_cap_histo.cpp
+++ b/src/tox_dht_cap_histo.cpp
@ -1,69 +0,0 @@
-#include "./tox_dht_cap_histo.hpp"
-
-#include <imgui/imgui.h>
-
-void ToxDHTCapHisto::tick(float time_delta) {
-	if (!_enabled) {
-		return;
-	}
-
-	_time_since_last_add += time_delta;
-	if (_time_since_last_add >= _value_add_interval) {
-		_time_since_last_add = 0.f; // very loose
-
-		const auto total = _tpi.toxDHTGetNumCloselist();
-		const auto with_cap = _tpi.toxDHTGetNumCloselistAnnounceCapable();
-
-		if (total == 0 || with_cap == 0) {
-			_ratios.push_back(0.f);
-		} else {
-			_ratios.push_back(float(with_cap) / float(total));
-		}
-
-		// TODO: limit
-		while (_ratios.size() > 5*60) {
-			_ratios.erase(_ratios.begin());
-		}
-	}
-}
-
-void ToxDHTCapHisto::render(void) {
-	{ // main window menubar injection
-		// assumes the window "tomato" was rendered already by cg
-		if (ImGui::Begin("tomato")) {
-			if (ImGui::BeginMenuBar()) {
-				ImGui::Separator();
-				if (ImGui::BeginMenu("Tox")) {
-					ImGui::SeparatorText("DHT diagnostics");
-
-					ImGui::Checkbox("enabled", &_enabled);
-
-					if (ImGui::MenuItem("show DHT announce capability histogram")) {
-						_show_window = true;
-					}
-
-					ImGui::EndMenu();
-				}
-				ImGui::EndMenuBar();
-			}
-
-		}
-		ImGui::End();
-	}
-
-
-	if (_show_window) {
-		if (ImGui::Begin("Tox DHT announce capability histogram", &_show_window)) {
-			if (_enabled) {
-				ImGui::PlotHistogram("##histogram", _ratios.data(), _ratios.size(), 0, nullptr, 0.f, 1.f, {-1, -1});
-			} else {
-				ImGui::TextUnformatted("logging disabled!");
-				if (ImGui::Button("enable")) {
-					_enabled = true;
-				}
-			}
-		}
-		ImGui::End();
-	}
-}
-
--- a/src/tox_dht_cap_histo.hpp
+++ b/src/tox_dht_cap_histo.hpp
@ -1,22 +0,0 @@
-#pragma once
-
-#include <solanaceae/toxcore/tox_private_interface.hpp>
-
-#include <vector>
-
-class ToxDHTCapHisto {
-	ToxPrivateI& _tpi;
-
-	bool _enabled {true};
-	bool _show_window {false};
-
-	std::vector<float> _ratios;
-	const float _value_add_interval {1.f}; // every second
-	float _time_since_last_add {0.f};
-
-	public:
-		ToxDHTCapHisto(ToxPrivateI& tpi) : _tpi(tpi) {}
-
-		void tick(float time_delta);
-		void render(void);
-};
--- a/src/tox_private_impl.hpp
+++ b/src/tox_private_impl.hpp
@ -1,19 +0,0 @@
-#pragma once
-
-#include <tox/tox_private.h>
-#include <solanaceae/toxcore/tox_private_interface.hpp>
-
-struct ToxPrivateImpl : public ToxPrivateI {
-	Tox* _tox = nullptr;
-
-	ToxPrivateImpl(Tox* tox) : _tox(tox) {}
-	virtual ~ToxPrivateImpl(void) {}
-
-	uint16_t toxDHTGetNumCloselist(void) override {
-		return tox_dht_get_num_closelist(_tox);
-	}
-
-	uint16_t toxDHTGetNumCloselistAnnounceCapable(void) override {
-		return tox_dht_get_num_closelist_announce_capable(_tox);
-	}
-};
--- a/src/tox_ui_utils.cpp
+++ b/src/tox_ui_utils.cpp
@ -1,7 +1,5 @@
 #include "./tox_ui_utils.hpp"

-#include <tox/tox.h>
-
 #include <solanaceae/toxcore/tox_interface.hpp>
 #include <solanaceae/toxcore/utils.hpp>

@ -23,8 +21,6 @@ void ToxUIUtils::render(void) {
 			if (ImGui::BeginMenuBar()) {
 				ImGui::Separator();
 				if (ImGui::BeginMenu("Tox")) {
-					ImGui::SeparatorText("Friends/Groups");
-
 					if (ImGui::MenuItem("add Friend by ID")) {
 						_show_add_friend_window = true;
 					}