Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Squashed 'external/toxcore/c-toxcore/' changes from c9cdae001..9ed2fa80d

Browse Source 
9ed2fa80d fix(toxav): remove extra copy of video frame on encode
de30cf3ad docs: Add new file kinds, that should be useful to all clients.
d5b5e879d fix(DHT): Correct node skipping logic timed out nodes.
30e71fe97 refactor: Generate event dispatch functions and add tox_events_dispatch.
8fdbb0b50 style: Format parameter lists in event handlers.
d00dee12b refactor: Add warning logs when losing chat invites.
b144e8db1 feat: Add a way to look up a file number by ID.
849281ea0 feat: Add a way to fetch groups by chat ID.
a2c177396 refactor: Harden event system and improve type safety.
8f5caa656 refactor: Add MessagePack string support to bin_pack.
34e8d5ad5 chore: Add GitHub CodeQL workflow and local Docker runner.
f7b068010 refactor: Add nullability annotations to event headers.
788abe651 refactor(toxav): Use system allocator for mutexes.
2e4b423eb refactor: Use specific typedefs for public API arrays.
2baf34775 docs(toxav): update idle iteration interval see 679444751876fa3882a717772918ebdc8f083354
2f87ac67b feat: Add Event Loop abstraction (Ev).
f8dfc38d8 test: Fix data race in ToxScenario virtual_clock.
38313921e test(TCP): Add regression test for TCP priority queue integrity.
f94a50d9a refactor(toxav): Replace mutable_mutex with dynamically allocated mutex.
ad054511e refactor: Internalize DHT structs and add debug helpers.
8b467cc96 fix: Prevent potential integer overflow in group chat handshake.
4962bdbb8 test: Improve TCP simulation and add tests
5f0227093 refactor: Allow nullable data in group chat handlers.
e97b18ea9 chore: Improve Windows Docker support.
b14943bbd refactor: Move Logger out of Messenger into Tox.
dd3136250 cleanup: Apply nullability qualifiers to C++ codebase.
1849f70fc refactor: Extract low-level networking code to net and os_network.
8fec75421 refactor: Delete tox_random, align on rng and os_random.
a03ae8051 refactor: Delete tox_memory, align on mem and os_memory.
4c88fed2c refactor: Use `std::` prefixes more consistently in C++ code.
72452f2ae test: Add some more tests for onion and shared key cache.
d5a51b09a cleanup: Use tox_attributes.h in tox_private.h and install it.
b6f5b9fc5 test: Add some benchmarks for various high level things.
8a8d02785 test(support): Introduce threaded Tox runner and simulation barrier
d68d1d095 perf(toxav): optimize audio and video intermediate buffers by keeping them around
REVERT: c9cdae001 fix(toxav): remove extra copy of video frame on encode

git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: 9ed2fa80d582c714d6bdde6a7648220a92cddff8
This commit is contained in:
Green Sky
2026-02-01 14:26:52 +01:00
parent 565efa4f39
commit 9b36dd9d99
274 changed files with 11891 additions and 4292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
auto_tests/BUILD.bazel
View File

@@ -4,6 +4,8 @@ cc_library(
name = "check_compat",
testonly = True,
hdrs = ["check_compat.h"],
visibility = ["//c-toxcore/auto_tests:__subpackages__"],
deps = ["//c-toxcore/toxcore:ccompat"],
)
cc_library(
@@ -14,11 +16,14 @@ cc_library(
deps = [
":check_compat",
"//c-toxcore/testing:misc_tools",
"//c-toxcore/toxcore:DHT",
"//c-toxcore/toxcore:Messenger",
"//c-toxcore/toxcore:mono_time",
"//c-toxcore/toxcore:net_crypto",
"//c-toxcore/toxcore:tox",
"//c-toxcore/toxcore:tox_dispatch",
"//c-toxcore/toxcore:tox_events",
"//c-toxcore/toxcore:tox_log_level",
],
)
@@ -72,6 +77,8 @@ extra_data = {
"//c-toxcore/toxcore:onion",
"//c-toxcore/toxcore:onion_announce",
"//c-toxcore/toxcore:onion_client",
"//c-toxcore/toxcore:os_memory",
"//c-toxcore/toxcore:os_random",
"//c-toxcore/toxcore:tox",
"//c-toxcore/toxcore:tox_dispatch",
"//c-toxcore/toxcore:tox_events",

5
auto_tests/Makefile.inc
View File

@@ -43,6 +43,7 @@ TESTS = \
scenario_friend_read_receipt_test \
scenario_friend_request_spam_test \
scenario_friend_request_test \
scenario_group_by_id_test \
scenario_group_general_test \
scenario_group_invite_test \
scenario_group_message_test \
@@ -232,6 +233,10 @@ scenario_friend_request_spam_test_SOURCES = ../auto_tests/scenarios/scenario_fri
scenario_friend_request_spam_test_CFLAGS = $(AUTOTEST_CFLAGS)
scenario_friend_request_spam_test_LDADD = $(AUTOTEST_LDADD) libscenario_framework.la
scenario_group_by_id_test_SOURCES = ../auto_tests/scenarios/scenario_group_by_id_test.c
scenario_group_by_id_test_CFLAGS = $(AUTOTEST_CFLAGS)
scenario_group_by_id_test_LDADD = $(AUTOTEST_LDADD) libscenario_framework.la
scenario_group_general_test_SOURCES = ../auto_tests/scenarios/scenario_group_general_test.c
scenario_group_general_test_CFLAGS = $(AUTOTEST_CFLAGS)
scenario_group_general_test_LDADD = $(AUTOTEST_LDADD) libscenario_framework.la

65
auto_tests/check_compat.h
View File

@@ -7,28 +7,53 @@
#include <stdlib.h>
#ifndef ck_assert
#define ck_assert(ok) do { \
if (!(ok)) { \
fprintf(stderr, "%s:%d: failed `%s'\n", __FILE__, __LINE__, #ok); \
exit(7); \
} \
} while (0)
#define ck_assert(ok) \
do { \
if (!(ok)) { \
fprintf(stderr, "%s:%d: failed `%s'\n", __FILE__, __LINE__, #ok); \
exit(7); \
} \
} while (0)
#define ck_assert_msg(ok, ...) do { \
if (!(ok)) { \
fprintf(stderr, "%s:%d: failed `%s': ", __FILE__, __LINE__, #ok); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
exit(7); \
} \
} while (0)
#define ck_assert_msg(ok, ...) \
do { \
if (!(ok)) { \
fprintf(stderr, "%s:%d: failed `%s': ", __FILE__, __LINE__, #ok); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
exit(7); \
} \
} while (0)
#define ck_abort_msg(...) do { \
fprintf(stderr, "%s:%d: ", __FILE__, __LINE__); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
exit(7); \
} while (0)
#define ck_assert_int_eq(a, b) \
do { \
const int32_t _a = (a); \
const int32_t _b = (b); \
if (_a != _b) { \
fprintf(stderr, "%s:%d: failed `%s == %s` (%d != %d)\n", __FILE__, __LINE__, #a, #b, \
_a, _b); \
exit(7); \
} \
} while (0)
#define ck_assert_uint_eq(a, b) \
do { \
const uint32_t _a = (a); \
const uint32_t _b = (b); \
if (_a != _b) { \
fprintf(stderr, "%s:%d: failed `%s == %s` (%u != %u)\n", __FILE__, __LINE__, #a, #b, \
_a, _b); \
exit(7); \
} \
} while (0)
#define ck_abort_msg(...) \
do { \
fprintf(stderr, "%s:%d: ", __FILE__, __LINE__); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
exit(7); \
} while (0)
#endif
#endif // C_TOXCORE_AUTO_TESTS_CHECK_COMPAT_H

3
auto_tests/scenarios/BUILD.bazel
View File

@@ -7,7 +7,10 @@ cc_library(
hdrs = ["framework/framework.h"],
visibility = ["//visibility:public"],
deps = [
"//c-toxcore/auto_tests:check_compat",
"//c-toxcore/testing:misc_tools",
"//c-toxcore/toxcore:attributes",
"//c-toxcore/toxcore:ccompat",
"//c-toxcore/toxcore:mono_time",
"//c-toxcore/toxcore:network",
"//c-toxcore/toxcore:tox",

1
auto_tests/scenarios/CMakeLists.txt
View File

@@ -45,6 +45,7 @@ scenario_test(scenario_friend_query)
scenario_test(scenario_friend_read_receipt)
scenario_test(scenario_friend_request)
scenario_test(scenario_friend_request_spam)
scenario_test(scenario_group_by_id)
scenario_test(scenario_group_general)
scenario_test(scenario_group_invite)
scenario_test(scenario_group_message)

15
auto_tests/scenarios/framework/framework.c
View File

@@ -159,15 +159,16 @@ ToxScenario *tox_scenario_new(int argc, char *const argv[], uint64_t timeout_ms)
ToxScenario *s = (ToxScenario *)calloc(1, sizeof(ToxScenario));
ck_assert(s != nullptr);
s->timeout_ms = timeout_ms;
s->virtual_clock = 1000;
s->trace_enabled = (getenv("TOX_TRACE") != nullptr);
s->event_log_enabled = (getenv("TOX_EVENT_LOG") != nullptr);
pthread_mutex_init(&s->mutex, nullptr);
pthread_mutex_init(&s->clock_mutex, nullptr);
pthread_cond_init(&s->cond_runner, nullptr);
pthread_cond_init(&s->cond_nodes, nullptr);
s->timeout_ms = timeout_ms;
s->virtual_clock = 1000;
s->trace_enabled = (getenv("TOX_TRACE") != nullptr);
s->event_log_enabled = (getenv("TOX_EVENT_LOG") != nullptr);
return s;
}
@@ -660,10 +661,10 @@ ToxScenarioStatus tox_scenario_run(ToxScenario *s)
pthread_mutex_lock(&s->mutex);
uint64_t start_clock = s->virtual_clock;
uint64_t start_clock = tox_scenario_get_time(s);
uint64_t deadline = start_clock + s->timeout_ms;
while (s->num_active > 0 && s->virtual_clock < deadline) {
while (s->num_active > 0 && tox_scenario_get_time(s) < deadline) {
// 1. Wait until all nodes (including finished ones) have reached the barrier
while (s->num_ready < s->num_nodes) {
pthread_cond_wait(&s->cond_runner, &s->mutex);
@@ -700,7 +701,7 @@ ToxScenarioStatus tox_scenario_run(ToxScenario *s)
ToxScenarioStatus result = (s->num_active == 0) ? TOX_SCENARIO_DONE : TOX_SCENARIO_TIMEOUT;
if (result == TOX_SCENARIO_TIMEOUT) {
tox_scenario_log(s, "Scenario TIMEOUT after %lu ms (virtual time)", (unsigned long)(s->virtual_clock - start_clock));
tox_scenario_log(s, "Scenario TIMEOUT after %lu ms (virtual time)", (unsigned long)(tox_scenario_get_time(s) - start_clock));
}
// Stop nodes

19
auto_tests/scenarios/framework/framework.h
View File

@@ -6,6 +6,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "../../check_compat.h"
#include "../../../toxcore/attributes.h"
#include "../../../toxcore/ccompat.h"
#include "../../../toxcore/tox.h"
@@ -194,22 +195,4 @@ void tox_node_friend_add(ToxNode *a, ToxNode *b);
*/
void tox_node_reload(ToxNode *node);
#ifndef ck_assert
#define ck_assert(ok) do { \
if (!(ok)) { \
fprintf(stderr, "%s:%d: failed `%s'\n", __FILE__, __LINE__, #ok); \
exit(7); \
} \
} while (0)
#define ck_assert_msg(ok, ...) do { \
if (!(ok)) { \
fprintf(stderr, "%s:%d: failed `%s': ", __FILE__, __LINE__, #ok); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
exit(7); \
} \
} while (0)
#endif
#endif // TOX_TEST_FRAMEWORK_H

28
auto_tests/scenarios/scenario_file_transfer_test.c
View File

@@ -106,6 +106,34 @@ static void sender_script(ToxNode *self, void *ctx)
uint32_t fnum = tox_file_send(tox_node_get_tox(self), 0, TOX_FILE_KIND_DATA, FILE_SIZE, nullptr, (const uint8_t *)FILENAME, sizeof(FILENAME), nullptr);
tox_node_log(self, "Started sending file %u", fnum);
Tox_File_Id file_id;
if (!tox_file_get_file_id(tox_node_get_tox(self), 0, fnum, file_id, nullptr)) {
tox_node_log(self, "Failed to get file id for file %u", fnum);
abort();
}
Tox_Err_File_By_Id err;
Tox_File_Number found_fnum = tox_file_by_id(tox_node_get_tox(self), 0, file_id, &err);
if (found_fnum != fnum) {
tox_node_log(self, "tox_file_by_id failed: expected %u, got %u, error %u", fnum, found_fnum, err);
abort();
}
/* Test with invalid friend number */
found_fnum = tox_file_by_id(tox_node_get_tox(self), 1234, file_id, &err);
if (found_fnum != UINT32_MAX || err != TOX_ERR_FILE_BY_ID_FRIEND_NOT_FOUND) {
tox_node_log(self, "tox_file_by_id with invalid friend failed: expected UINT32_MAX and FRIEND_NOT_FOUND, got %u and error %u", found_fnum, err);
abort();
}
/* Test with invalid file id */
Tox_File_Id invalid_id = {0};
found_fnum = tox_file_by_id(tox_node_get_tox(self), 0, invalid_id, &err);
if (found_fnum != UINT32_MAX || err != TOX_ERR_FILE_BY_ID_NOT_FOUND) {
tox_node_log(self, "tox_file_by_id with invalid id failed: expected UINT32_MAX and NOT_FOUND, got %u and error %u", found_fnum, err);
abort();
}
WAIT_UNTIL(state->file_sending_done);
tox_node_log(self, "Done");
}

96
auto_tests/scenarios/scenario_group_by_id_test.c Normal file
View File

@@ -0,0 +1,96 @@
#include "framework/framework.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#define GROUP_NAME "NASA Headquarters"
#define GROUP_NAME_LEN (sizeof(GROUP_NAME) - 1)
#define PEER_NICK "Test Nick"
#define PEER_NICK_LEN (sizeof(PEER_NICK) - 1)
typedef struct {
uint32_t group_number;
uint8_t chat_id[TOX_GROUP_CHAT_ID_SIZE];
} GroupState;
static void script(ToxNode *self, void *ctx)
{
GroupState *state = (GroupState *)ctx;
Tox *tox = tox_node_get_tox(self);
Tox_Err_Group_New err_new;
state->group_number = tox_group_new(tox, TOX_GROUP_PRIVACY_STATE_PUBLIC, (const uint8_t *)GROUP_NAME, GROUP_NAME_LEN, (const uint8_t *)PEER_NICK, PEER_NICK_LEN, &err_new);
ck_assert_int_eq(err_new, TOX_ERR_GROUP_NEW_OK);
tox_node_log(self, "Group created: %u", state->group_number);
Tox_Err_Group_State_Query err_query;
ck_assert(tox_group_get_chat_id(tox, state->group_number, state->chat_id, &err_query));
ck_assert_int_eq(err_query, TOX_ERR_GROUP_STATE_QUERY_OK);
{
// Test tox_group_by_id
Tox_Err_Group_By_Id err_by_id;
uint32_t group_number = tox_group_by_id(tox, state->chat_id, &err_by_id);
ck_assert_int_eq(err_by_id, TOX_ERR_GROUP_BY_ID_OK);
ck_assert_uint_eq(group_number, state->group_number);
// Test tox_group_by_id with invalid ID
uint8_t invalid_chat_id[TOX_GROUP_CHAT_ID_SIZE];
memset(invalid_chat_id, 0xAA, TOX_GROUP_CHAT_ID_SIZE);
group_number = tox_group_by_id(tox, invalid_chat_id, &err_by_id);
ck_assert_int_eq(err_by_id, TOX_ERR_GROUP_BY_ID_NOT_FOUND);
ck_assert_uint_eq(group_number, UINT32_MAX);
// Test tox_group_by_id with NULL ID
group_number = tox_group_by_id(tox, NULL, &err_by_id);
ck_assert_int_eq(err_by_id, TOX_ERR_GROUP_BY_ID_NULL);
ck_assert_uint_eq(group_number, UINT32_MAX);
}
// Create another group to ensure it works with multiple groups
Tox_Group_Number group2 = tox_group_new(tox, TOX_GROUP_PRIVACY_STATE_PUBLIC, (const uint8_t *)"Group 2", 7, (const uint8_t *)PEER_NICK, PEER_NICK_LEN, &err_new);
ck_assert_int_eq(err_new, TOX_ERR_GROUP_NEW_OK);
uint8_t chat_id2[TOX_GROUP_CHAT_ID_SIZE];
ck_assert(tox_group_get_chat_id(tox, group2, chat_id2, &err_query));
ck_assert_int_eq(err_query, TOX_ERR_GROUP_STATE_QUERY_OK);
{
Tox_Err_Group_By_Id err_by_id;
ck_assert_uint_eq(tox_group_by_id(tox, state->chat_id, &err_by_id), state->group_number);
ck_assert_int_eq(err_by_id, TOX_ERR_GROUP_BY_ID_OK);
ck_assert_uint_eq(tox_group_by_id(tox, chat_id2, &err_by_id), group2);
ck_assert_int_eq(err_by_id, TOX_ERR_GROUP_BY_ID_OK);
}
Tox_Err_Group_Leave err_leave;
ck_assert(tox_group_leave(tox, state->group_number, nullptr, 0, &err_leave));
ck_assert_int_eq(err_leave, TOX_ERR_GROUP_LEAVE_OK);
// Yield to allow the group to be actually deleted
tox_scenario_yield(self);
{
// After leaving, it should not be found
Tox_Err_Group_By_Id err_by_id;
uint32_t group_number = tox_group_by_id(tox, state->chat_id, &err_by_id);
ck_assert_int_eq(err_by_id, TOX_ERR_GROUP_BY_ID_NOT_FOUND);
ck_assert_uint_eq(group_number, UINT32_MAX);
}
}
int main(int argc, char *argv[])
{
ToxScenario *s = tox_scenario_new(argc, argv, 60000);
GroupState state = {0};
tox_scenario_add_node(s, "Node", script, &state, sizeof(GroupState));
ToxScenarioStatus res = tox_scenario_run(s);
if (res != TOX_SCENARIO_DONE) {
return 1;
}
tox_scenario_free(s);
return 0;
}

4
auto_tests/scenarios/scenario_group_topic_test.c
View File

@@ -305,6 +305,8 @@ int main(int argc, char *argv[])
return 0;
}
#undef GROUP_NAME
#undef TOPIC2
#undef TOPIC1
#undef GROUP_NAME_LEN
#undef GROUP_NAME
#undef NUM_PEERS