Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

Squashed 'external/toxcore/c-toxcore/' changes from e2c01e457b..b03b571272

Browse Source 
b03b571272 fix: flaky tcp test This only fixes the symptoms, not the real problem. Sometimes or consistently on some platforms a socket might need a moment before it can be written to.
32e67ab4c2 cleanup: use typedef for private message ID's in callback
7b1db6adc1 feat: add message IDs to private group messages
99e0bcc27d refactor: Observers/ignored peers can now send and receive custom packets
b3c3c49d26 fix: Disable IPv6 in Windows cross-compilation tests
e742deddff feat: Check hashes of Windows dependencies when cross-compiling
dfb9a0b02b fix: Test the current Windows Dockerfile, not an old Dockerhub image
14de93ccec chore: Use WineHQ's Wine as Debian Bookworm's crashes
ed37616249 docs: Update the Windows cross-compilation section
9bb79c174f cleanup: Remove a couple of unnecessary misc_tools dependencies
19475adb70 chore: Statically link OpenMP into the cracker fun util on Windows
1be311e51f feat: Build the fun utils when cross-compiling to Windows
88133f8446 chore: Strip Windows binaries
3cc0ae7535 refactor: Copy over all of the required static dependencies
c4fa8f7fb1 feat: Generate .def, .exp and .lib files when building for Windows
74bbac5363 feat: Let CMake create the dll instead of doing so ourselves
246642e9ae feat: Harden Windows cross-compilation
8d431c0d11 chore: Bump Windows build dependency versions
e519f7998b fix: Remove unnecessary wsock32 dependency on Windows
ed2b60c217 chore: Use a specific non-broken slimcc version.
d7f21010a1 chore: Update github actions.
e71a68b7f2 docs: Update the list of CMake options
77e08876ff chore: Remove mod and founder from group API naming scheme
12bc042767 docs: add the experimental api build option to INSTALL.md
e1fa5cae96 refactor: Rename Queries to Query to align with other enums.
be82a3ea30 fix: Correct type for conference offline peer numbers.
0627c36716 test: Add pkgsrc build.
92578afe4b test: Add FreeBSD VM action on GitHub.
52ece0f57b test: Build toxcore on NetBSD (VM).
3fe8ee2c11 chore: Only install tox_private.h on request.
9a8dfa06ab fix: save_compatibility_test failing on big-endian systems
86f5e55578 fix: Don't serve files from websockify.
710eb674a5 fix: Correctly pass extended public keys to group moderation code.
021db7031c refactor: Use `struct`s for extended public/secret keys.
a1e999fd80 chore: Compile libsodium reference implementation with compcert.
fbe3c19cf5 cleanup: correct a few nullable annotations
623e3ee5c3 cleanup: Don't use `memcpy` to cast arbitrary `struct`s to `uint8_t[]`.
c71567dc18 fix: Pass array, not array pointer, to `memcmp`.
9b46a08144 cleanup: Never pass `void*` directly to `memcpy`.
5d7b7a7bbc refactor: Use tox rng to seed the keypair generation.
961891d568 cleanup: Small improvements found by PVS Studio.
8201019f0d chore: Disable NGC saving by default, enable through Tox_Options.
5dd9ee3f65 cleanup: Replace pointer arithmetic with explicit `&arr[i]`.
ca4606d49d refactor: Use strong typedef for NGC peer id.
442213b722 cleanup: Simplify custom packet length check in NGC.
08d3393def fix: Correct a few potential null derefs in bootstrap daemon.
b9877b32b0 fix: Add missing memunlock of local variable when it goes out of scope.
dab5fe44b9 fix: Zero out stack-allocated secret key before return.
f058103299 refactor: Make prune_gc_sanctions_list more obviously correct.
3ba7a0dec9 docs: Add static analysis tool list to README.
8d0811a0f3 docs: Run prettier-markdown on markdown files.
969e3a2bfc refactor: Fix network test not using the strong typedef
93c83fbc7c refactor: Use strong typedef instead of struct for `Socket`.
9fe18b176f fix: Fix some false positive from PVS Studio.
7c44379ccb cleanup: Check that WINXP macro exists before comparing it.
5c93231bef refactor: Make tox mutex non-recursive.
aacff73939 docs: Fix up doxyfile.
d55fc85ff5 docs: Add more documentation to crypto_core.
5bdaaaedb6 refactor: Remove `Tox *` from `tox_dispatch`.
e202341e76 refactor: Don't rely on tox_dispatch passing tox in tests.
34df938f52 chore: Use C++ mode for clang-tidy.
8b05296a78 chore: Check that both gtest and gmock exist for tests.
42010660e1 test: Add slimcc compiler compatibility test.
b473630321 chore: Add some comments to the astyle config.
b7404f24f6 cleanup: Remove implicit bool conversions.
4e2dba4d9f chore: Reformat sources with astyle.
4359e3a6bc chore: Rename C++ headers to .hh suffixes.
0c05566e58 cleanup: Further `#include` cleanups.
8d29935b7a chore: Only check the bootstrap daemon checksum on release.
f70e588bc6 cleanup: Add more `const` where possible.
511bfe39c8 cleanup: Use Bazel modules to enforce proper `#include` hygiene.
1710a0d091 refactor: Move pack/unpack `IP_Port` from DHT into network module.
a975943564 chore: Really fix coverage docker image build.
c08409390f chore: Fix post-submit coverage image.
39aadf8922 fix: Don't use `memcmp` to compare `IP_Port`s.
d94246a906 fix: partially fix a bug that prevented group part messages from sending.
eeaa039222 chore: Fix rpm build; add a CI check for it.
8328449c1a chore: Speed up docker builds a bit by reducing layer count.
d6d67d56f3 cleanup: Add `const` where possible in auto tests.
6aa9e6850d cleanup: Minor cleanup of event unpack code.
bdf460a3a9 refactor: Rename `system_{memory,...}` to `os_{memory,...}`.
203e1af81e fix: a few off by one errors in group autotests
5c093c4888 cleanup: Remove all uses of `SIZEOF_VLA`.
662c2140f3 test: Add goblint static analyser.
8f07755834 cleanup: Use `memzero(x, s)` instead of `memset(x, 0, s)`.
a7258e40cf cleanup: Use explicit 0 instead of `PACKET_ID_PADDING`.
6370d0f15d cleanup: Expand the `Tox_Options` accessor macros.
14a1a0b9bd cleanup: Remove plan9 support.
a05dccad13 test: Add a simple new/delete test for Tox.
1cdcf938b9 cleanup: Add comment after every `#endif`.
ba99d4dc4b test: Fix comment I broke in the events test PR.
e07248debb refactor: Migrate auto_tests to new events API.
bdd42b5452 refactor: Add common msgpack array packer with callback.
3c659f5288 cleanup: Rename group to conference in groupav documentation.
89957be230 cleanup: Ensure handler params are named after callback params.
c650d9d345 refactor: Pass `this` pointer as first param to s11n callbacks.
e7fb91ddb8 refactor: Allow NULL pointers for byte arrays in events.
5e2c8cabc1 cleanup: make some improvements to group moderation test
259de4867e cleanup: Remove `bin_pack_{new,free}`.
21a8ff5895 cleanup: skip a do_gc iteration before removing peers marked for deletion
16809dc36e feat: Add dht_get_nodes_response event to the events system.

git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: b03b5712720de9a9901ea12fd741f177327a7021
This commit is contained in:
Green Sky
2024-03-07 23:12:55 +01:00
parent 61accfe184
commit aae086cc65
358 changed files with 8093 additions and 5229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
toxcore/tox_event.c
View File

@ -6,6 +6,7 @@
#include <assert.h>
#include "attributes.h"
#include "bin_pack.h"
#include "bin_unpack.h"
#include "ccompat.h"
@ -132,6 +133,9 @@ const char *tox_event_type_to_string(Tox_Event_Type type)
case TOX_EVENT_GROUP_MODERATION:
return "TOX_EVENT_GROUP_MODERATION";
case TOX_EVENT_DHT_GET_NODES_RESPONSE:
return "TOX_EVENT_DHT_GET_NODES_RESPONSE";
case TOX_EVENT_INVALID:
return "TOX_EVENT_INVALID";
}
@ -346,6 +350,11 @@ bool tox_event_construct(Tox_Event *event, Tox_Event_Type type, const Memory *me
break;
}
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
event->data.dht_get_nodes_response = tox_event_dht_get_nodes_response_new(mem);
break;
}
case TOX_EVENT_INVALID: {
return false;
}
@ -556,6 +565,11 @@ void tox_event_destruct(Tox_Event *event, const Memory *mem)
break;
}
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
tox_event_dht_get_nodes_response_free(event->data.dht_get_nodes_response, mem);
break;
}
case TOX_EVENT_INVALID: {
break;
}
@ -691,6 +705,9 @@ static bool tox_event_data_pack(Tox_Event_Type type, const Tox_Event_Data *data,
case TOX_EVENT_GROUP_MODERATION:
return tox_event_group_moderation_pack(data->group_moderation, bp);
case TOX_EVENT_DHT_GET_NODES_RESPONSE:
return tox_event_dht_get_nodes_response_pack(data->dht_get_nodes_response, bp);
case TOX_EVENT_INVALID:
return false;
}
@ -906,6 +923,11 @@ static bool tox_event_type_from_int(uint32_t value, Tox_Event_Type *out)
return true;
}
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
*out = TOX_EVENT_DHT_GET_NODES_RESPONSE;
return true;
}
case TOX_EVENT_INVALID: {
*out = TOX_EVENT_INVALID;
return true;
@ -919,148 +941,136 @@ static bool tox_event_type_from_int(uint32_t value, Tox_Event_Type *out)
}
non_null()
static bool tox_event_type_unpack(Bin_Unpack *bu, Tox_Event_Type *val)
static bool tox_event_type_unpack(Tox_Event_Type *val, Bin_Unpack *bu)
{
uint32_t u32;
return bin_unpack_u32(bu, &u32)
&& tox_event_type_from_int(u32, val);
}
bool tox_event_unpack_into(Tox_Event *event, Bin_Unpack *bu, const Memory *mem)
non_null()
static bool tox_event_data_unpack(Tox_Event_Type type, Tox_Event_Data *data, Bin_Unpack *bu, const Memory *mem)
{
uint32_t size;
if (!bin_unpack_array(bu, &size)) {
return false;
}
if (size != 2) {
return false;
}
Tox_Event_Type type;
if (!tox_event_type_unpack(bu, &type)) {
return false;
}
event->type = type;
switch (type) {
case TOX_EVENT_CONFERENCE_CONNECTED:
return tox_event_conference_connected_unpack(&event->data.conference_connected, bu, mem);
return tox_event_conference_connected_unpack(&data->conference_connected, bu, mem);
case TOX_EVENT_CONFERENCE_INVITE:
return tox_event_conference_invite_unpack(&event->data.conference_invite, bu, mem);
return tox_event_conference_invite_unpack(&data->conference_invite, bu, mem);
case TOX_EVENT_CONFERENCE_MESSAGE:
return tox_event_conference_message_unpack(&event->data.conference_message, bu, mem);
return tox_event_conference_message_unpack(&data->conference_message, bu, mem);
case TOX_EVENT_CONFERENCE_PEER_LIST_CHANGED:
return tox_event_conference_peer_list_changed_unpack(&event->data.conference_peer_list_changed, bu, mem);
return tox_event_conference_peer_list_changed_unpack(&data->conference_peer_list_changed, bu, mem);
case TOX_EVENT_CONFERENCE_PEER_NAME:
return tox_event_conference_peer_name_unpack(&event->data.conference_peer_name, bu, mem);
return tox_event_conference_peer_name_unpack(&data->conference_peer_name, bu, mem);
case TOX_EVENT_CONFERENCE_TITLE:
return tox_event_conference_title_unpack(&event->data.conference_title, bu, mem);
return tox_event_conference_title_unpack(&data->conference_title, bu, mem);
case TOX_EVENT_FILE_CHUNK_REQUEST:
return tox_event_file_chunk_request_unpack(&event->data.file_chunk_request, bu, mem);
return tox_event_file_chunk_request_unpack(&data->file_chunk_request, bu, mem);
case TOX_EVENT_FILE_RECV_CHUNK:
return tox_event_file_recv_chunk_unpack(&event->data.file_recv_chunk, bu, mem);
return tox_event_file_recv_chunk_unpack(&data->file_recv_chunk, bu, mem);
case TOX_EVENT_FILE_RECV_CONTROL:
return tox_event_file_recv_control_unpack(&event->data.file_recv_control, bu, mem);
return tox_event_file_recv_control_unpack(&data->file_recv_control, bu, mem);
case TOX_EVENT_FILE_RECV:
return tox_event_file_recv_unpack(&event->data.file_recv, bu, mem);
return tox_event_file_recv_unpack(&data->file_recv, bu, mem);
case TOX_EVENT_FRIEND_CONNECTION_STATUS:
return tox_event_friend_connection_status_unpack(&event->data.friend_connection_status, bu, mem);
return tox_event_friend_connection_status_unpack(&data->friend_connection_status, bu, mem);
case TOX_EVENT_FRIEND_LOSSLESS_PACKET:
return tox_event_friend_lossless_packet_unpack(&event->data.friend_lossless_packet, bu, mem);
return tox_event_friend_lossless_packet_unpack(&data->friend_lossless_packet, bu, mem);
case TOX_EVENT_FRIEND_LOSSY_PACKET:
return tox_event_friend_lossy_packet_unpack(&event->data.friend_lossy_packet, bu, mem);
return tox_event_friend_lossy_packet_unpack(&data->friend_lossy_packet, bu, mem);
case TOX_EVENT_FRIEND_MESSAGE:
return tox_event_friend_message_unpack(&event->data.friend_message, bu, mem);
return tox_event_friend_message_unpack(&data->friend_message, bu, mem);
case TOX_EVENT_FRIEND_NAME:
return tox_event_friend_name_unpack(&event->data.friend_name, bu, mem);
return tox_event_friend_name_unpack(&data->friend_name, bu, mem);
case TOX_EVENT_FRIEND_READ_RECEIPT:
return tox_event_friend_read_receipt_unpack(&event->data.friend_read_receipt, bu, mem);
return tox_event_friend_read_receipt_unpack(&data->friend_read_receipt, bu, mem);
case TOX_EVENT_FRIEND_REQUEST:
return tox_event_friend_request_unpack(&event->data.friend_request, bu, mem);
return tox_event_friend_request_unpack(&data->friend_request, bu, mem);
case TOX_EVENT_FRIEND_STATUS_MESSAGE:
return tox_event_friend_status_message_unpack(&event->data.friend_status_message, bu, mem);
return tox_event_friend_status_message_unpack(&data->friend_status_message, bu, mem);
case TOX_EVENT_FRIEND_STATUS:
return tox_event_friend_status_unpack(&event->data.friend_status, bu, mem);
return tox_event_friend_status_unpack(&data->friend_status, bu, mem);
case TOX_EVENT_FRIEND_TYPING:
return tox_event_friend_typing_unpack(&event->data.friend_typing, bu, mem);
return tox_event_friend_typing_unpack(&data->friend_typing, bu, mem);
case TOX_EVENT_SELF_CONNECTION_STATUS:
return tox_event_self_connection_status_unpack(&event->data.self_connection_status, bu, mem);
return tox_event_self_connection_status_unpack(&data->self_connection_status, bu, mem);
case TOX_EVENT_GROUP_PEER_NAME:
return tox_event_group_peer_name_unpack(&event->data.group_peer_name, bu, mem);
return tox_event_group_peer_name_unpack(&data->group_peer_name, bu, mem);
case TOX_EVENT_GROUP_PEER_STATUS:
return tox_event_group_peer_status_unpack(&event->data.group_peer_status, bu, mem);
return tox_event_group_peer_status_unpack(&data->group_peer_status, bu, mem);
case TOX_EVENT_GROUP_TOPIC:
return tox_event_group_topic_unpack(&event->data.group_topic, bu, mem);
return tox_event_group_topic_unpack(&data->group_topic, bu, mem);
case TOX_EVENT_GROUP_PRIVACY_STATE:
return tox_event_group_privacy_state_unpack(&event->data.group_privacy_state, bu, mem);
return tox_event_group_privacy_state_unpack(&data->group_privacy_state, bu, mem);
case TOX_EVENT_GROUP_VOICE_STATE:
return tox_event_group_voice_state_unpack(&event->data.group_voice_state, bu, mem);
return tox_event_group_voice_state_unpack(&data->group_voice_state, bu, mem);
case TOX_EVENT_GROUP_TOPIC_LOCK:
return tox_event_group_topic_lock_unpack(&event->data.group_topic_lock, bu, mem);
return tox_event_group_topic_lock_unpack(&data->group_topic_lock, bu, mem);
case TOX_EVENT_GROUP_PEER_LIMIT:
return tox_event_group_peer_limit_unpack(&event->data.group_peer_limit, bu, mem);
return tox_event_group_peer_limit_unpack(&data->group_peer_limit, bu, mem);
case TOX_EVENT_GROUP_PASSWORD:
return tox_event_group_password_unpack(&event->data.group_password, bu, mem);
return tox_event_group_password_unpack(&data->group_password, bu, mem);
case TOX_EVENT_GROUP_MESSAGE:
return tox_event_group_message_unpack(&event->data.group_message, bu, mem);
return tox_event_group_message_unpack(&data->group_message, bu, mem);
case TOX_EVENT_GROUP_PRIVATE_MESSAGE:
return tox_event_group_private_message_unpack(&event->data.group_private_message, bu, mem);
return tox_event_group_private_message_unpack(&data->group_private_message, bu, mem);
case TOX_EVENT_GROUP_CUSTOM_PACKET:
return tox_event_group_custom_packet_unpack(&event->data.group_custom_packet, bu, mem);
return tox_event_group_custom_packet_unpack(&data->group_custom_packet, bu, mem);
case TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET:
return tox_event_group_custom_private_packet_unpack(&event->data.group_custom_private_packet, bu, mem);
return tox_event_group_custom_private_packet_unpack(&data->group_custom_private_packet, bu, mem);
case TOX_EVENT_GROUP_INVITE:
return tox_event_group_invite_unpack(&event->data.group_invite, bu, mem);
return tox_event_group_invite_unpack(&data->group_invite, bu, mem);
case TOX_EVENT_GROUP_PEER_JOIN:
return tox_event_group_peer_join_unpack(&event->data.group_peer_join, bu, mem);
return tox_event_group_peer_join_unpack(&data->group_peer_join, bu, mem);
case TOX_EVENT_GROUP_PEER_EXIT:
return tox_event_group_peer_exit_unpack(&event->data.group_peer_exit, bu, mem);
return tox_event_group_peer_exit_unpack(&data->group_peer_exit, bu, mem);
case TOX_EVENT_GROUP_SELF_JOIN:
return tox_event_group_self_join_unpack(&event->data.group_self_join, bu, mem);
return tox_event_group_self_join_unpack(&data->group_self_join, bu, mem);
case TOX_EVENT_GROUP_JOIN_FAIL:
return tox_event_group_join_fail_unpack(&event->data.group_join_fail, bu, mem);
return tox_event_group_join_fail_unpack(&data->group_join_fail, bu, mem);
case TOX_EVENT_GROUP_MODERATION:
return tox_event_group_moderation_unpack(&event->data.group_moderation, bu, mem);
return tox_event_group_moderation_unpack(&data->group_moderation, bu, mem);
case TOX_EVENT_DHT_GET_NODES_RESPONSE:
return tox_event_dht_get_nodes_response_unpack(&data->dht_get_nodes_response, bu, mem);
case TOX_EVENT_INVALID:
return false;
@ -1068,3 +1078,10 @@ bool tox_event_unpack_into(Tox_Event *event, Bin_Unpack *bu, const Memory *mem)
return false;
}
bool tox_event_unpack_into(Tox_Event *event, Bin_Unpack *bu, const Memory *mem)
{
return bin_unpack_array_fixed(bu, 2, nullptr) //
&& tox_event_type_unpack(&event->type, bu) //
&& tox_event_data_unpack(event->type, &event->data, bu, mem);
}