Green Sky
aae086cc65
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
183 lines
5.8 KiB
C
183 lines
5.8 KiB
C
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
|
|
typedef struct State {
|
|
bool connected;
|
|
uint32_t conference;
|
|
} State;
|
|
|
|
#define NUM_INVITE_MERGE_TOX 5
|
|
|
|
#include "auto_test_support.h"
|
|
|
|
static void handle_conference_invite(
|
|
const Tox_Event_Conference_Invite *event, void *user_data)
|
|
{
|
|
const AutoTox *autotox = (AutoTox *)user_data;
|
|
State *state = (State *)autotox->state;
|
|
|
|
const uint32_t friend_number = tox_event_conference_invite_get_friend_number(event);
|
|
const uint8_t *cookie = tox_event_conference_invite_get_cookie(event);
|
|
const size_t length = tox_event_conference_invite_get_cookie_length(event);
|
|
|
|
if (friend_number != -1) {
|
|
Tox_Err_Conference_Join err;
|
|
state->conference = tox_conference_join(autotox->tox, friend_number, cookie, length, &err);
|
|
ck_assert_msg(err == TOX_ERR_CONFERENCE_JOIN_OK,
|
|
"attempting to join the conference returned with an error: %d", err);
|
|
fprintf(stderr, "#%u accepted invite to conference %u\n", autotox->index, state->conference);
|
|
}
|
|
}
|
|
|
|
static void handle_conference_connected(
|
|
const Tox_Event_Conference_Connected *event, void *user_data)
|
|
{
|
|
const AutoTox *autotox = (AutoTox *)user_data;
|
|
State *state = (State *)autotox->state;
|
|
|
|
fprintf(stderr, "#%u connected to conference %u\n", autotox->index, state->conference);
|
|
state->connected = true;
|
|
}
|
|
|
|
static void wait_connected(AutoTox *autotoxes, const AutoTox *autotox, uint32_t friendnumber)
|
|
{
|
|
do {
|
|
iterate_all_wait(autotoxes, NUM_INVITE_MERGE_TOX, ITERATION_INTERVAL);
|
|
} while (tox_friend_get_connection_status(autotox->tox, friendnumber, nullptr) == TOX_CONNECTION_NONE);
|
|
}
|
|
|
|
static void do_invite(AutoTox *autotoxes, AutoTox *inviter, AutoTox *invitee, uint32_t friendnum)
|
|
{
|
|
fprintf(stderr, "#%u inviting #%u\n", inviter->index, invitee->index);
|
|
|
|
Tox_Err_Conference_Invite err;
|
|
tox_conference_invite(inviter->tox, friendnum, ((State *)inviter->state)->conference, &err);
|
|
ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK,
|
|
"#%u attempting to invite #%u (friendnumber %u) returned with an error: %d", inviter->index, invitee->index,
|
|
friendnum, err);
|
|
|
|
do {
|
|
iterate_all_wait(autotoxes, NUM_INVITE_MERGE_TOX, ITERATION_INTERVAL);
|
|
} while (!((State *)invitee->state)->connected);
|
|
}
|
|
|
|
static bool group_complete(AutoTox *autotoxes)
|
|
{
|
|
int c = -1, size = 0;
|
|
|
|
for (int i = 0; i < NUM_INVITE_MERGE_TOX; i++) {
|
|
if (!autotoxes[i].alive) {
|
|
continue;
|
|
}
|
|
|
|
const int ct = tox_conference_peer_count(autotoxes[i].tox, ((State *)autotoxes[i].state)->conference, nullptr);
|
|
|
|
if (c == -1) {
|
|
c = ct;
|
|
} else if (c != ct) {
|
|
return false;
|
|
}
|
|
|
|
++size;
|
|
}
|
|
|
|
return (c == size);
|
|
}
|
|
|
|
static void wait_group_complete(AutoTox *autotoxes)
|
|
{
|
|
do {
|
|
iterate_all_wait(autotoxes, NUM_INVITE_MERGE_TOX, ITERATION_INTERVAL);
|
|
} while (!group_complete(autotoxes));
|
|
}
|
|
|
|
static void conference_invite_merge_test(AutoTox *autotoxes)
|
|
{
|
|
// Test that an explicit invite between peers in different connected
|
|
// components will cause a split group to merge
|
|
|
|
for (int i = 0; i < NUM_INVITE_MERGE_TOX; i++) {
|
|
tox_events_callback_conference_invite(autotoxes[i].dispatch, handle_conference_invite);
|
|
tox_events_callback_conference_connected(autotoxes[i].dispatch, handle_conference_connected);
|
|
}
|
|
|
|
State *state2 = (State *)autotoxes[2].state;
|
|
|
|
{
|
|
// Create new conference, tox 2 is the founder.
|
|
Tox_Err_Conference_New err;
|
|
state2->conference = tox_conference_new(autotoxes[2].tox, &err);
|
|
state2->connected = true;
|
|
ck_assert_msg(err == TOX_ERR_CONFERENCE_NEW_OK,
|
|
"attempting to create a new conference returned with an error: %d", err);
|
|
fprintf(stderr, "Created conference: index=%u\n", state2->conference);
|
|
}
|
|
|
|
save_autotox(&autotoxes[2]);
|
|
|
|
do_invite(autotoxes, &autotoxes[2], &autotoxes[1], 0);
|
|
do_invite(autotoxes, &autotoxes[1], &autotoxes[0], 0);
|
|
|
|
save_autotox(&autotoxes[1]);
|
|
kill_autotox(&autotoxes[1]);
|
|
|
|
do {
|
|
iterate_all_wait(autotoxes, NUM_INVITE_MERGE_TOX, ITERATION_INTERVAL);
|
|
} while (tox_conference_peer_count(autotoxes[2].tox, state2->conference, nullptr) != 1);
|
|
|
|
do_invite(autotoxes, &autotoxes[2], &autotoxes[3], 1);
|
|
do_invite(autotoxes, &autotoxes[3], &autotoxes[4], 1);
|
|
|
|
kill_autotox(&autotoxes[2]);
|
|
|
|
reload(&autotoxes[1]);
|
|
|
|
uint8_t public_key[TOX_PUBLIC_KEY_SIZE];
|
|
tox_self_get_public_key(autotoxes[1].tox, public_key);
|
|
tox_friend_add_norequest(autotoxes[3].tox, public_key, nullptr);
|
|
tox_self_get_public_key(autotoxes[3].tox, public_key);
|
|
tox_friend_add_norequest(autotoxes[1].tox, public_key, nullptr);
|
|
wait_connected(autotoxes, &autotoxes[1], 2);
|
|
|
|
do_invite(autotoxes, &autotoxes[1], &autotoxes[3], 2);
|
|
|
|
fprintf(stderr, "Waiting for group to merge\n");
|
|
|
|
wait_group_complete(autotoxes);
|
|
|
|
fprintf(stderr, "Group merged\n");
|
|
|
|
reload(&autotoxes[2]);
|
|
wait_connected(autotoxes, &autotoxes[2], 0);
|
|
do_invite(autotoxes, &autotoxes[2], &autotoxes[1], 0);
|
|
|
|
fprintf(stderr, "Waiting for #2 to rejoin\n");
|
|
|
|
wait_group_complete(autotoxes);
|
|
|
|
kill_autotox(&autotoxes[2]);
|
|
wait_group_complete(autotoxes);
|
|
reload(&autotoxes[2]);
|
|
wait_connected(autotoxes, &autotoxes[2], 0);
|
|
wait_connected(autotoxes, &autotoxes[1], 1);
|
|
|
|
do_invite(autotoxes, &autotoxes[1], &autotoxes[2], 1);
|
|
|
|
fprintf(stderr, "Waiting for #2 to rejoin\n");
|
|
|
|
wait_group_complete(autotoxes);
|
|
}
|
|
|
|
int main(void)
|
|
{
|
|
setvbuf(stdout, nullptr, _IONBF, 0);
|
|
|
|
Run_Auto_Options options = default_run_auto_options();
|
|
options.graph = GRAPH_LINEAR;
|
|
|
|
run_auto_test(nullptr, NUM_INVITE_MERGE_TOX, conference_invite_merge_test, sizeof(State), &options);
|
|
|
|
return 0;
|
|
}
|