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

101
toxcore/tox_dispatch.c
View File

@ -6,6 +6,7 @@
#include <stdlib.h>
#include "attributes.h"
#include "ccompat.h"
#include "events/events_alloc.h" // IWYU pragma: keep
#include "tox.h"
@ -52,6 +53,7 @@ struct Tox_Dispatch {
tox_events_group_self_join_cb *group_self_join_callback;
tox_events_group_join_fail_cb *group_join_fail_callback;
tox_events_group_moderation_cb *group_moderation_callback;
tox_events_dht_get_nodes_response_cb *dht_get_nodes_response_callback;
};
Tox_Dispatch *tox_dispatch_new(Tox_Err_Dispatch_New *error)
@ -277,14 +279,19 @@ void tox_events_callback_group_moderation(
{
dispatch->group_moderation_callback = callback;
}
void tox_events_callback_dht_get_nodes_response(
Tox_Dispatch *dispatch, tox_events_dht_get_nodes_response_cb *callback)
{
dispatch->dht_get_nodes_response_callback = callback;
}
non_null(1, 2) nullable(3, 4)
static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Event *event, Tox *tox, void *user_data)
non_null(1, 2) nullable(3)
static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Event *event, void *user_data)
{
switch (event->type) {
case TOX_EVENT_CONFERENCE_CONNECTED: {
if (dispatch->conference_connected_callback != nullptr) {
dispatch->conference_connected_callback(tox, event->data.conference_connected, user_data);
dispatch->conference_connected_callback(event->data.conference_connected, user_data);
}
break;
@ -292,7 +299,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_CONFERENCE_INVITE: {
if (dispatch->conference_invite_callback != nullptr) {
dispatch->conference_invite_callback(tox, event->data.conference_invite, user_data);
dispatch->conference_invite_callback(event->data.conference_invite, user_data);
}
break;
@ -300,7 +307,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_CONFERENCE_MESSAGE: {
if (dispatch->conference_message_callback != nullptr) {
dispatch->conference_message_callback(tox, event->data.conference_message, user_data);
dispatch->conference_message_callback(event->data.conference_message, user_data);
}
break;
@ -308,7 +315,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_CONFERENCE_PEER_LIST_CHANGED: {
if (dispatch->conference_peer_list_changed_callback != nullptr) {
dispatch->conference_peer_list_changed_callback(tox, event->data.conference_peer_list_changed, user_data);
dispatch->conference_peer_list_changed_callback(event->data.conference_peer_list_changed, user_data);
}
break;
@ -316,7 +323,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_CONFERENCE_PEER_NAME: {
if (dispatch->conference_peer_name_callback != nullptr) {
dispatch->conference_peer_name_callback(tox, event->data.conference_peer_name, user_data);
dispatch->conference_peer_name_callback(event->data.conference_peer_name, user_data);
}
break;
@ -324,7 +331,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_CONFERENCE_TITLE: {
if (dispatch->conference_title_callback != nullptr) {
dispatch->conference_title_callback(tox, event->data.conference_title, user_data);
dispatch->conference_title_callback(event->data.conference_title, user_data);
}
break;
@ -332,7 +339,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FILE_CHUNK_REQUEST: {
if (dispatch->file_chunk_request_callback != nullptr) {
dispatch->file_chunk_request_callback(tox, event->data.file_chunk_request, user_data);
dispatch->file_chunk_request_callback(event->data.file_chunk_request, user_data);
}
break;
@ -340,7 +347,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FILE_RECV_CHUNK: {
if (dispatch->file_recv_chunk_callback != nullptr) {
dispatch->file_recv_chunk_callback(tox, event->data.file_recv_chunk, user_data);
dispatch->file_recv_chunk_callback(event->data.file_recv_chunk, user_data);
}
break;
@ -348,7 +355,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FILE_RECV_CONTROL: {
if (dispatch->file_recv_control_callback != nullptr) {
dispatch->file_recv_control_callback(tox, event->data.file_recv_control, user_data);
dispatch->file_recv_control_callback(event->data.file_recv_control, user_data);
}
break;
@ -356,7 +363,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FILE_RECV: {
if (dispatch->file_recv_callback != nullptr) {
dispatch->file_recv_callback(tox, event->data.file_recv, user_data);
dispatch->file_recv_callback(event->data.file_recv, user_data);
}
break;
@ -364,7 +371,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_CONNECTION_STATUS: {
if (dispatch->friend_connection_status_callback != nullptr) {
dispatch->friend_connection_status_callback(tox, event->data.friend_connection_status, user_data);
dispatch->friend_connection_status_callback(event->data.friend_connection_status, user_data);
}
break;
@ -372,7 +379,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_LOSSLESS_PACKET: {
if (dispatch->friend_lossless_packet_callback != nullptr) {
dispatch->friend_lossless_packet_callback(tox, event->data.friend_lossless_packet, user_data);
dispatch->friend_lossless_packet_callback(event->data.friend_lossless_packet, user_data);
}
break;
@ -380,7 +387,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_LOSSY_PACKET: {
if (dispatch->friend_lossy_packet_callback != nullptr) {
dispatch->friend_lossy_packet_callback(tox, event->data.friend_lossy_packet, user_data);
dispatch->friend_lossy_packet_callback(event->data.friend_lossy_packet, user_data);
}
break;
@ -388,7 +395,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_MESSAGE: {
if (dispatch->friend_message_callback != nullptr) {
dispatch->friend_message_callback(tox, event->data.friend_message, user_data);
dispatch->friend_message_callback(event->data.friend_message, user_data);
}
break;
@ -396,7 +403,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_NAME: {
if (dispatch->friend_name_callback != nullptr) {
dispatch->friend_name_callback(tox, event->data.friend_name, user_data);
dispatch->friend_name_callback(event->data.friend_name, user_data);
}
break;
@ -404,7 +411,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_READ_RECEIPT: {
if (dispatch->friend_read_receipt_callback != nullptr) {
dispatch->friend_read_receipt_callback(tox, event->data.friend_read_receipt, user_data);
dispatch->friend_read_receipt_callback(event->data.friend_read_receipt, user_data);
}
break;
@ -412,7 +419,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_REQUEST: {
if (dispatch->friend_request_callback != nullptr) {
dispatch->friend_request_callback(tox, event->data.friend_request, user_data);
dispatch->friend_request_callback(event->data.friend_request, user_data);
}
break;
@ -420,7 +427,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_STATUS: {
if (dispatch->friend_status_callback != nullptr) {
dispatch->friend_status_callback(tox, event->data.friend_status, user_data);
dispatch->friend_status_callback(event->data.friend_status, user_data);
}
break;
@ -428,7 +435,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_STATUS_MESSAGE: {
if (dispatch->friend_status_message_callback != nullptr) {
dispatch->friend_status_message_callback(tox, event->data.friend_status_message, user_data);
dispatch->friend_status_message_callback(event->data.friend_status_message, user_data);
}
break;
@ -436,7 +443,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_FRIEND_TYPING: {
if (dispatch->friend_typing_callback != nullptr) {
dispatch->friend_typing_callback(tox, event->data.friend_typing, user_data);
dispatch->friend_typing_callback(event->data.friend_typing, user_data);
}
break;
@ -444,7 +451,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_SELF_CONNECTION_STATUS: {
if (dispatch->self_connection_status_callback != nullptr) {
dispatch->self_connection_status_callback(tox, event->data.self_connection_status, user_data);
dispatch->self_connection_status_callback(event->data.self_connection_status, user_data);
}
break;
@ -452,7 +459,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_PEER_NAME: {
if (dispatch->group_peer_name_callback != nullptr) {
dispatch->group_peer_name_callback(tox, event->data.group_peer_name, user_data);
dispatch->group_peer_name_callback(event->data.group_peer_name, user_data);
}
break;
@ -460,7 +467,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_PEER_STATUS: {
if (dispatch->group_peer_status_callback != nullptr) {
dispatch->group_peer_status_callback(tox, event->data.group_peer_status, user_data);
dispatch->group_peer_status_callback(event->data.group_peer_status, user_data);
}
break;
@ -468,7 +475,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_TOPIC: {
if (dispatch->group_topic_callback != nullptr) {
dispatch->group_topic_callback(tox, event->data.group_topic, user_data);
dispatch->group_topic_callback(event->data.group_topic, user_data);
}
break;
@ -476,7 +483,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_PRIVACY_STATE: {
if (dispatch->group_privacy_state_callback != nullptr) {
dispatch->group_privacy_state_callback(tox, event->data.group_privacy_state, user_data);
dispatch->group_privacy_state_callback(event->data.group_privacy_state, user_data);
}
break;
@ -484,7 +491,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_VOICE_STATE: {
if (dispatch->group_voice_state_callback != nullptr) {
dispatch->group_voice_state_callback(tox, event->data.group_voice_state, user_data);
dispatch->group_voice_state_callback(event->data.group_voice_state, user_data);
}
break;
@ -492,7 +499,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_TOPIC_LOCK: {
if (dispatch->group_topic_lock_callback != nullptr) {
dispatch->group_topic_lock_callback(tox, event->data.group_topic_lock, user_data);
dispatch->group_topic_lock_callback(event->data.group_topic_lock, user_data);
}
break;
@ -500,7 +507,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_PEER_LIMIT: {
if (dispatch->group_peer_limit_callback != nullptr) {
dispatch->group_peer_limit_callback(tox, event->data.group_peer_limit, user_data);
dispatch->group_peer_limit_callback(event->data.group_peer_limit, user_data);
}
break;
@ -508,7 +515,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_PASSWORD: {
if (dispatch->group_password_callback != nullptr) {
dispatch->group_password_callback(tox, event->data.group_password, user_data);
dispatch->group_password_callback(event->data.group_password, user_data);
}
break;
@ -516,7 +523,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_MESSAGE: {
if (dispatch->group_message_callback != nullptr) {
dispatch->group_message_callback(tox, event->data.group_message, user_data);
dispatch->group_message_callback(event->data.group_message, user_data);
}
break;
@ -524,7 +531,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_PRIVATE_MESSAGE: {
if (dispatch->group_private_message_callback != nullptr) {
dispatch->group_private_message_callback(tox, event->data.group_private_message, user_data);
dispatch->group_private_message_callback(event->data.group_private_message, user_data);
}
break;
@ -532,7 +539,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_CUSTOM_PACKET: {
if (dispatch->group_custom_packet_callback != nullptr) {
dispatch->group_custom_packet_callback(tox, event->data.group_custom_packet, user_data);
dispatch->group_custom_packet_callback(event->data.group_custom_packet, user_data);
}
break;
@ -540,7 +547,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET: {
if (dispatch->group_custom_private_packet_callback != nullptr) {
dispatch->group_custom_private_packet_callback(tox, event->data.group_custom_private_packet, user_data);
dispatch->group_custom_private_packet_callback(event->data.group_custom_private_packet, user_data);
}
break;
@ -548,7 +555,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_INVITE: {
if (dispatch->group_invite_callback != nullptr) {
dispatch->group_invite_callback(tox, event->data.group_invite, user_data);
dispatch->group_invite_callback(event->data.group_invite, user_data);
}
break;
@ -556,7 +563,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_PEER_JOIN: {
if (dispatch->group_peer_join_callback != nullptr) {
dispatch->group_peer_join_callback(tox, event->data.group_peer_join, user_data);
dispatch->group_peer_join_callback(event->data.group_peer_join, user_data);
}
break;
@ -564,7 +571,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_PEER_EXIT: {
if (dispatch->group_peer_exit_callback != nullptr) {
dispatch->group_peer_exit_callback(tox, event->data.group_peer_exit, user_data);
dispatch->group_peer_exit_callback(event->data.group_peer_exit, user_data);
}
break;
@ -572,7 +579,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_SELF_JOIN: {
if (dispatch->group_self_join_callback != nullptr) {
dispatch->group_self_join_callback(tox, event->data.group_self_join, user_data);
dispatch->group_self_join_callback(event->data.group_self_join, user_data);
}
break;
@ -580,7 +587,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_JOIN_FAIL: {
if (dispatch->group_join_fail_callback != nullptr) {
dispatch->group_join_fail_callback(tox, event->data.group_join_fail, user_data);
dispatch->group_join_fail_callback(event->data.group_join_fail, user_data);
}
break;
@ -588,7 +595,15 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
case TOX_EVENT_GROUP_MODERATION: {
if (dispatch->group_moderation_callback != nullptr) {
dispatch->group_moderation_callback(tox, event->data.group_moderation, user_data);
dispatch->group_moderation_callback(event->data.group_moderation, user_data);
}
break;
}
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
if (dispatch->dht_get_nodes_response_callback != nullptr) {
dispatch->dht_get_nodes_response_callback(event->data.dht_get_nodes_response, user_data);
}
break;
@ -600,11 +615,11 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
}
}
void tox_dispatch_invoke(const Tox_Dispatch *dispatch, const Tox_Events *events, Tox *tox, void *user_data)
void tox_dispatch_invoke(const Tox_Dispatch *dispatch, const Tox_Events *events, void *user_data)
{
const uint32_t size = tox_events_get_size(events);
for (uint32_t i = 0; i < size; ++i) {
const Tox_Event *event = &events->events[i];
tox_dispatch_invoke_event(dispatch, event, tox, user_data);
tox_dispatch_invoke_event(dispatch, event, user_data);
}
}