From 32a8dba185482fe1a89037bce2a5b0c5e76d4127 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Mon, 13 Nov 2023 14:02:43 +0100 Subject: [PATCH] Squashed 'external/toxcore/c-toxcore/' changes from 82460b2124..38e4c82fe0 38e4c82fe0 feat: add ngc events 8099d82397 diagnostic: get the number of close dht nodes with announce/store support d01c116764 cleanup: make it more clear that assert and uint32_t increment both only exist if NDEBUG is not defined 58fac53429 refactor: Add a `bin_unpack_bin_max` for max-length arrays. 6be29f01e5 chore: Add more logging to loading conferences from savedata. 1195271b7f Fix inversed return values 82276ef5ac cleanup: Fix GCC compatibility. REVERT: 82460b2124 feat: add ngc events git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 38e4c82fe0fc373b9d43ee9ad2b8fe5fd1d26810 --- .circleci/bazel-test | 8 ++-- .circleci/config.yml | 29 ++++++-------- .cirrus.yml | 8 ++-- auto_tests/BUILD.bazel | 18 ++++++++- auto_tests/dht_getnodes_api_test.c | 6 +++ .../docker/tox-bootstrapd.sha256 | 2 +- testing/fuzzing/BUILD.bazel | 8 ++-- testing/fuzzing/fuzz_support.cc | 8 ++-- toxcore/DHT.c | 32 ++++++++++++++- toxcore/DHT.h | 18 +++++++++ toxcore/Messenger.c | 5 +++ toxcore/bin_unpack.c | 22 ++++++++-- toxcore/bin_unpack.h | 16 ++++++-- toxcore/events/conference_invite.c | 2 +- toxcore/events/conference_message.c | 2 +- toxcore/events/conference_peer_name.c | 2 +- toxcore/events/conference_title.c | 2 +- toxcore/events/file_chunk_request.c | 2 +- toxcore/events/file_recv.c | 2 +- toxcore/events/file_recv_chunk.c | 2 +- toxcore/events/file_recv_control.c | 2 +- toxcore/events/friend_connection_status.c | 2 +- toxcore/events/friend_lossless_packet.c | 2 +- toxcore/events/friend_lossy_packet.c | 2 +- toxcore/events/friend_message.c | 2 +- toxcore/events/friend_name.c | 2 +- toxcore/events/friend_read_receipt.c | 2 +- toxcore/events/friend_request.c | 2 +- toxcore/events/friend_status.c | 2 +- toxcore/events/friend_status_message.c | 2 +- toxcore/events/friend_typing.c | 2 +- toxcore/group.c | 4 ++ toxcore/group_chats.c | 4 +- toxcore/group_pack.c | 40 ++++++++++++------- toxcore/network.c | 2 +- toxcore/state.c | 2 +- toxcore/tox_private.c | 17 ++++++++ toxcore/tox_private.h | 16 ++++++++ 38 files changed, 220 insertions(+), 81 deletions(-) diff --git a/.circleci/bazel-test b/.circleci/bazel-test index b2d236d..b44119f 100755 --- a/.circleci/bazel-test +++ b/.circleci/bazel-test @@ -4,11 +4,9 @@ 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 \ - --config=remote \ - --build_tag_filters=-haskell \ - --test_tag_filters=-haskell \ - --remote_download_minimal \ + --build_tag_filters=-haskell,-fuzz-test \ + --test_tag_filters=-haskell,-fuzz-test \ -- \ - //c-toxcore/... \ "$@" diff --git a/.circleci/config.yml b/.circleci/config.yml index bfa39f0..ee37ea5 100644 --- a/.circleci/config.yml +++ b/.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,6 +29,7 @@ jobs: steps: - checkout - run: .circleci/bazel-test + //c-toxcore/... bazel-tsan: working_directory: /tmp/cirrus-ci-build @@ -38,11 +39,22 @@ 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: @@ -91,21 +103,6 @@ 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: diff --git a/.cirrus.yml b/.cirrus.yml index f0b49c0..3050ead 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,10 +9,9 @@ bazel-opt_task: - /src/workspace/tools/inject-repo c-toxcore test_all_script: - cd /src/workspace && bazel test -k - --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST + --config=ci --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? @@ -27,10 +26,9 @@ bazel-dbg_task: - /src/workspace/tools/inject-repo c-toxcore test_all_script: - cd /src/workspace && bazel test -k - --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST + --config=ci --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? @@ -45,7 +43,7 @@ cimple_task: - /src/workspace/tools/inject-repo c-toxcore test_all_script: - cd /src/workspace && bazel test -k - --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST + --config=ci --build_tag_filters=haskell --test_tag_filters=haskell -- diff --git a/auto_tests/BUILD.bazel b/auto_tests/BUILD.bazel index babd3ac..d06ec17 100644 --- a/auto_tests/BUILD.bazel +++ b/auto_tests/BUILD.bazel @@ -29,12 +29,26 @@ 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] + ["$(location //c-toxcore/other/proxy)"], - data = glob(["data/*"]) + ["//c-toxcore/other/proxy"], + args = ["$(location %s)" % src] + extra_args.get( + src[:-2], + [], + ), + data = glob(["data/*"]) + extra_data.get( + src[:-2], + [], + ), flaky = flaky_tests.get( src[:-2], False, diff --git a/auto_tests/dht_getnodes_api_test.c b/auto_tests/dht_getnodes_api_test.c index 8071f34..d98e9f7 100644 --- a/auto_tests/dht_getnodes_api_test.c +++ b/auto_tests/dht_getnodes_api_test.c @@ -122,6 +122,12 @@ 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)) { diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 index b446660..52143b5 100644 --- a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 +++ b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 @@ -1 +1 @@ -4f5b47978dc26aed78719526f862a44693f821db12f5ff6d70b338d67fb6f784 /usr/local/bin/tox-bootstrapd +9bec65f2a3093ebb49c3751dfad267482bc80d4b29ef9171f11d5ba53058d713 /usr/local/bin/tox-bootstrapd diff --git a/testing/fuzzing/BUILD.bazel b/testing/fuzzing/BUILD.bazel index 386516d..7144954 100644 --- a/testing/fuzzing/BUILD.bazel +++ b/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 = [ diff --git a/testing/fuzzing/fuzz_support.cc b/testing/fuzzing/fuzz_support.cc index 510a656..04a0bf7 100644 --- a/testing/fuzzing/fuzz_support.cc +++ b/testing/fuzzing/fuzz_support.cc @@ -22,6 +22,8 @@ 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; @@ -182,7 +184,7 @@ Fuzz_System::Fuzz_System(Fuzz_Data &input) } , data(input) { - sys->mono_time_callback = ![](Fuzz_System *self) { return self->clock; }; + sys->mono_time_callback = get_self_clock; sys->mono_time_user_data = this; sys->mem = mem.get(); sys->ns = ns.get(); @@ -269,7 +271,7 @@ Null_System::Null_System() std::make_unique(Random{&null_random_funcs, this}), } { - sys->mono_time_callback = ![](Fuzz_System *self) { return self->clock; }; + sys->mono_time_callback = get_self_clock; sys->mono_time_user_data = this; sys->mem = mem.get(); sys->ns = ns.get(); @@ -400,7 +402,7 @@ Record_System::Record_System(Global &global, uint64_t seed, const char *name) , seed_(seed) , name_(name) { - sys->mono_time_callback = ![](Fuzz_System *self) { return self->clock; }; + sys->mono_time_callback = get_self_clock; sys->mono_time_user_data = this; sys->mem = mem.get(); sys->ns = ns.get(); diff --git a/toxcore/DHT.c b/toxcore/DHT.c index 7590764..80f477c 100644 --- a/toxcore/DHT.c +++ b/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; -#endif assert(increment == PACKED_NODE_SIZE_IP4 || increment == PACKED_NODE_SIZE_IP6); +#endif } 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; -#endif assert(increment == PACKED_NODE_SIZE_IP4 || increment == PACKED_NODE_SIZE_IP6); +#endif } if (processed_data_len != nullptr) { @@ -2965,6 +2965,34 @@ 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); diff --git a/toxcore/DHT.h b/toxcore/DHT.h index d4fc33d..6021958 100644 --- a/toxcore/DHT.h +++ b/toxcore/DHT.h @@ -515,6 +515,24 @@ 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. * diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index fc28e0c..136838d 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -2988,6 +2988,7 @@ 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; } @@ -3219,9 +3220,13 @@ 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; diff --git a/toxcore/bin_unpack.c b/toxcore/bin_unpack.c index ff591ca..07fdfcf 100644 --- a/toxcore/bin_unpack.c +++ b/toxcore/bin_unpack.c @@ -73,10 +73,14 @@ 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) +bool bin_unpack_array_fixed(Bin_Unpack *bu, uint32_t required_size, uint32_t *actual_size) { - uint32_t size; - return cmp_read_array(&bu->ctx, &size) && size == 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; } bool bin_unpack_bool(Bin_Unpack *bu, bool *val) @@ -128,6 +132,18 @@ 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; diff --git a/toxcore/bin_unpack.h b/toxcore/bin_unpack.h index bd4d878..441318a 100644 --- a/toxcore/bin_unpack.h +++ b/toxcore/bin_unpack.h @@ -45,10 +45,14 @@ 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() bool bin_unpack_array_fixed(Bin_Unpack *bu, uint32_t required_size); +non_null(1) nullable(3) +bool bin_unpack_array_fixed(Bin_Unpack *bu, uint32_t required_size, uint32_t *actual_size); /** @brief Unpack a MessagePack bool. */ non_null() bool bin_unpack_bool(Bin_Unpack *bu, bool *val); @@ -71,10 +75,16 @@ 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. * - * Unlike the function above, this function does not allocate any memory, but requires the size to - * be known up front. + * Similar to the function above, but doesn't output the data length. */ non_null() bool bin_unpack_bin_fixed(Bin_Unpack *bu, uint8_t *data, uint32_t data_length); diff --git a/toxcore/events/conference_invite.c b/toxcore/events/conference_invite.c index 1d88f41..64a4898 100644 --- a/toxcore/events/conference_invite.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/toxcore/events/conference_message.c b/toxcore/events/conference_message.c index bc9a19b..e877fec 100644 --- a/toxcore/events/conference_message.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 4, nullptr)) { return false; } diff --git a/toxcore/events/conference_peer_name.c b/toxcore/events/conference_peer_name.c index 4d3f285..07aaa5a 100644 --- a/toxcore/events/conference_peer_name.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/toxcore/events/conference_title.c b/toxcore/events/conference_title.c index 1866966..13bd8cb 100644 --- a/toxcore/events/conference_title.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/toxcore/events/file_chunk_request.c b/toxcore/events/file_chunk_request.c index f5a9421..b7c3042 100644 --- a/toxcore/events/file_chunk_request.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 4, nullptr)) { return false; } diff --git a/toxcore/events/file_recv.c b/toxcore/events/file_recv.c index a907b3f..a11132d 100644 --- a/toxcore/events/file_recv.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 5, nullptr)) { return false; } diff --git a/toxcore/events/file_recv_chunk.c b/toxcore/events/file_recv_chunk.c index 0fe7784..aa9bcf1 100644 --- a/toxcore/events/file_recv_chunk.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 4, nullptr)) { return false; } diff --git a/toxcore/events/file_recv_control.c b/toxcore/events/file_recv_control.c index af04b33..c66a310 100644 --- a/toxcore/events/file_recv_control.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/toxcore/events/friend_connection_status.c b/toxcore/events/friend_connection_status.c index 3d325ef..230428d 100644 --- a/toxcore/events/friend_connection_status.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/toxcore/events/friend_lossless_packet.c b/toxcore/events/friend_lossless_packet.c index 944abd4..0fd2605 100644 --- a/toxcore/events/friend_lossless_packet.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/toxcore/events/friend_lossy_packet.c b/toxcore/events/friend_lossy_packet.c index a787fce..a6639ee 100644 --- a/toxcore/events/friend_lossy_packet.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/toxcore/events/friend_message.c b/toxcore/events/friend_message.c index 8fa6a19..a66483f 100644 --- a/toxcore/events/friend_message.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/toxcore/events/friend_name.c b/toxcore/events/friend_name.c index 1239183..364ddcf 100644 --- a/toxcore/events/friend_name.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/toxcore/events/friend_read_receipt.c b/toxcore/events/friend_read_receipt.c index 1485b67..dee1aa4 100644 --- a/toxcore/events/friend_read_receipt.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/toxcore/events/friend_request.c b/toxcore/events/friend_request.c index 3366f54..e7ecf67 100644 --- a/toxcore/events/friend_request.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/toxcore/events/friend_status.c b/toxcore/events/friend_status.c index 1e1e934..75c7d35 100644 --- a/toxcore/events/friend_status.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/toxcore/events/friend_status_message.c b/toxcore/events/friend_status_message.c index 91fa88e..c54d154 100644 --- a/toxcore/events/friend_status_message.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/toxcore/events/friend_typing.c b/toxcore/events/friend_typing.c index 83c4dba..4a05abc 100644 --- a/toxcore/events/friend_typing.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/toxcore/group.c b/toxcore/group.c index 0e851b1..40e81a1 100644 --- a/toxcore/group.c +++ b/toxcore/group.c @@ -802,6 +802,7 @@ 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; } @@ -3679,6 +3680,7 @@ 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; } @@ -3696,6 +3698,7 @@ 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; } @@ -3705,6 +3708,7 @@ 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; } diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c index ac10e8b..3fc4130 100644 --- a/toxcore/group_chats.c +++ b/toxcore/group_chats.c @@ -6961,12 +6961,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 true; + return false; } free(data); - return false; + return true; } /** diff --git a/toxcore/group_pack.c b/toxcore/group_pack.c index ecdd965..db41ba9 100644 --- a/toxcore/group_pack.c +++ b/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)) { + if (!bin_unpack_array_fixed(bu, 8, nullptr)) { LOGGER_ERROR(chat->log, "Group state values array malformed"); return false; } @@ -58,15 +58,23 @@ 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)) { + if (!bin_unpack_array_fixed(bu, 5, nullptr)) { LOGGER_ERROR(chat->log, "Group state binary array malformed"); return false; } - 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) + 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)) && 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; @@ -78,7 +86,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)) { + if (!bin_unpack_array_fixed(bu, 6, nullptr)) { LOGGER_ERROR(chat->log, "Group topic array malformed"); return false; } @@ -86,7 +94,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_fixed(bu, chat->topic_info.topic, chat->topic_info.length) + && 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.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"); @@ -99,8 +107,9 @@ 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) { - if (!bin_unpack_array_fixed(bu, 2)) { - LOGGER_ERROR(chat->log, "Group mod list array malformed"); + 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); return false; } @@ -148,7 +157,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)) { + if (!bin_unpack_array_fixed(bu, 4, nullptr)) { LOGGER_ERROR(chat->log, "Group keys array malformed"); return false; } @@ -167,7 +176,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)) { + if (!bin_unpack_array_fixed(bu, 4, nullptr)) { LOGGER_ERROR(chat->log, "Group self info array malformed"); return false; } @@ -214,7 +223,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)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { LOGGER_ERROR(chat->log, "Group saved peers array malformed"); return false; } @@ -256,8 +265,9 @@ static bool load_unpack_saved_peers(GC_Chat *chat, Bin_Unpack *bu) bool gc_load_unpack_group(GC_Chat *chat, Bin_Unpack *bu) { - if (!bin_unpack_array_fixed(bu, 7)) { - LOGGER_ERROR(chat->log, "Group info array malformed"); + 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); return false; } diff --git a/toxcore/network.c b/toxcore/network.c index cc04cde..0dd3c53 100644 --- a/toxcore/network.c +++ b/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]; + uint8_t data[MAX_UDP_PACKET_SIZE] = {0}; uint32_t length; while (receivepacket(net->ns, net->mem, net->log, net->sock, &ip_port, data, &length) != -1) { diff --git a/toxcore/state.c b/toxcore/state.c index 701cf44..e4f769a 100644 --- a/toxcore/state.c +++ b/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: %u).", type); + LOGGER_ERROR(log, "Error occcured in state file (type: 0x%02x).", type); return -1; } diff --git a/toxcore/tox_private.c b/toxcore/tox_private.c index 72a9335..b42619f 100644 --- a/toxcore/tox_private.c +++ b/toxcore/tox_private.c @@ -149,3 +149,20 @@ 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; +} + diff --git a/toxcore/tox_private.h b/toxcore/tox_private.h index c823571..1503293 100644 --- a/toxcore/tox_private.h +++ b/toxcore/tox_private.h @@ -140,6 +140,22 @@ 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