forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from e2c01e457b..b03b571272
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:
@ -14,7 +14,13 @@
|
||||
|
||||
#include "DHT.h"
|
||||
#include "TCP_connection.h"
|
||||
#include "attributes.h"
|
||||
#include "crypto_core.h"
|
||||
#include "group_moderation.h"
|
||||
#include "logger.h"
|
||||
#include "mem.h"
|
||||
#include "mono_time.h"
|
||||
#include "network.h"
|
||||
|
||||
#define MAX_GC_PART_MESSAGE_SIZE 128
|
||||
#define MAX_GC_NICK_SIZE 128
|
||||
@ -73,7 +79,7 @@ typedef struct GC_Exit_Info {
|
||||
} GC_Exit_Info;
|
||||
|
||||
typedef struct GC_PeerAddress {
|
||||
uint8_t public_key[EXT_PUBLIC_KEY_SIZE];
|
||||
Extended_Public_Key public_key;
|
||||
IP_Port ip_port;
|
||||
} GC_PeerAddress;
|
||||
|
||||
@ -133,6 +139,7 @@ typedef struct GC_Connection {
|
||||
bool pending_key_rotation_request;
|
||||
|
||||
bool pending_delete; /* true if this peer has been marked for deletion */
|
||||
bool delete_this_iteration; /* true if this peer should be deleted this do_gc() iteration*/
|
||||
GC_Exit_Info exit_info;
|
||||
} GC_Connection;
|
||||
|
||||
@ -210,6 +217,15 @@ typedef struct GC_TimedOutPeer {
|
||||
uint64_t last_reconn_try; // the last time we tried to establish a new connection
|
||||
} GC_TimedOutPeer;
|
||||
|
||||
typedef bitwise uint32_t GC_Peer_Id_Value;
|
||||
|
||||
typedef struct GC_Peer_Id {
|
||||
GC_Peer_Id_Value value;
|
||||
} GC_Peer_Id;
|
||||
|
||||
GC_Peer_Id gc_peer_id_from_int(uint32_t value);
|
||||
uint32_t gc_peer_id_to_int(GC_Peer_Id peer_id);
|
||||
|
||||
typedef struct GC_Peer {
|
||||
/* Below state is sent to other peers in peer info exchange */
|
||||
uint8_t nick[MAX_GC_NICK_SIZE];
|
||||
@ -218,7 +234,7 @@ typedef struct GC_Peer {
|
||||
|
||||
/* Below state is local only */
|
||||
Group_Role role;
|
||||
uint32_t peer_id; // permanent ID (used for the public API)
|
||||
GC_Peer_Id peer_id; // permanent ID (used for the public API)
|
||||
bool ignore;
|
||||
|
||||
GC_Connection gconn;
|
||||
@ -226,7 +242,7 @@ typedef struct GC_Peer {
|
||||
|
||||
typedef struct GC_SharedState {
|
||||
uint32_t version;
|
||||
uint8_t founder_public_key[EXT_PUBLIC_KEY_SIZE];
|
||||
Extended_Public_Key founder_public_key;
|
||||
uint16_t maxpeers;
|
||||
uint16_t group_name_len;
|
||||
uint8_t group_name[MAX_GC_GROUP_NAME_SIZE];
|
||||
@ -281,11 +297,11 @@ typedef struct GC_Chat {
|
||||
uint32_t numpeers;
|
||||
int group_number;
|
||||
|
||||
uint8_t chat_public_key[EXT_PUBLIC_KEY_SIZE]; // the chat_id is the sig portion
|
||||
uint8_t chat_secret_key[EXT_SECRET_KEY_SIZE]; // only used by the founder
|
||||
Extended_Public_Key chat_public_key; // the chat_id is the sig portion
|
||||
Extended_Secret_Key chat_secret_key; // only used by the founder
|
||||
|
||||
uint8_t self_public_key[EXT_PUBLIC_KEY_SIZE];
|
||||
uint8_t self_secret_key[EXT_SECRET_KEY_SIZE];
|
||||
Extended_Public_Key self_public_key;
|
||||
Extended_Secret_Key self_secret_key;
|
||||
|
||||
uint64_t time_connected;
|
||||
uint64_t last_ping_interval;
|
||||
@ -320,6 +336,8 @@ typedef struct GC_Chat {
|
||||
|
||||
uint8_t m_group_public_key[CRYPTO_PUBLIC_KEY_SIZE]; // public key for group's messenger friend connection
|
||||
int friend_connection_id; // identifier for group's messenger friend connection
|
||||
|
||||
bool flag_exit; // true if the group will be deleted after the next do_gc() iteration
|
||||
} GC_Chat;
|
||||
|
||||
#ifndef MESSENGER_DEFINED
|
||||
@ -327,34 +345,34 @@ typedef struct GC_Chat {
|
||||
typedef struct Messenger Messenger;
|
||||
#endif /* MESSENGER_DEFINED */
|
||||
|
||||
typedef void gc_message_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id, unsigned int type,
|
||||
const uint8_t *data, size_t length, uint32_t message_id, void *user_data);
|
||||
typedef void gc_private_message_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id, unsigned int type,
|
||||
const uint8_t *data, size_t length, void *user_data);
|
||||
typedef void gc_custom_packet_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id, const uint8_t *data,
|
||||
typedef void gc_message_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id, unsigned int type,
|
||||
const uint8_t *message, size_t length, uint32_t message_id, void *user_data);
|
||||
typedef void gc_private_message_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id, unsigned int type,
|
||||
const uint8_t *message, size_t length, uint32_t message_id, void *user_data);
|
||||
typedef void gc_custom_packet_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id, const uint8_t *data,
|
||||
size_t length, void *user_data);
|
||||
typedef void gc_custom_private_packet_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id,
|
||||
const uint8_t *data,
|
||||
size_t length, void *user_data);
|
||||
typedef void gc_moderation_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id, uint32_t target_peer,
|
||||
unsigned int mod_event, void *user_data);
|
||||
typedef void gc_nick_change_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id, const uint8_t *data,
|
||||
typedef void gc_custom_private_packet_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id,
|
||||
const uint8_t *data, size_t length, void *user_data);
|
||||
typedef void gc_moderation_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id source_peer_number,
|
||||
GC_Peer_Id target_peer_number, unsigned int mod_type, void *user_data);
|
||||
typedef void gc_nick_change_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id, const uint8_t *name,
|
||||
size_t length, void *user_data);
|
||||
typedef void gc_status_change_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id, unsigned int status,
|
||||
typedef void gc_status_change_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id, unsigned int status,
|
||||
void *user_data);
|
||||
typedef void gc_topic_change_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id, const uint8_t *data,
|
||||
typedef void gc_topic_change_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id, const uint8_t *topic,
|
||||
size_t length, void *user_data);
|
||||
typedef void gc_topic_lock_cb(const Messenger *m, uint32_t group_number, unsigned int topic_lock, void *user_data);
|
||||
typedef void gc_voice_state_cb(const Messenger *m, uint32_t group_number, unsigned int voice_state, void *user_data);
|
||||
typedef void gc_peer_limit_cb(const Messenger *m, uint32_t group_number, uint32_t max_peers, void *user_data);
|
||||
typedef void gc_privacy_state_cb(const Messenger *m, uint32_t group_number, unsigned int state, void *user_data);
|
||||
typedef void gc_password_cb(const Messenger *m, uint32_t group_number, const uint8_t *data, size_t length,
|
||||
typedef void gc_peer_limit_cb(const Messenger *m, uint32_t group_number, uint32_t peer_limit, void *user_data);
|
||||
typedef void gc_privacy_state_cb(const Messenger *m, uint32_t group_number, unsigned int privacy_state, void *user_data);
|
||||
typedef void gc_password_cb(const Messenger *m, uint32_t group_number, const uint8_t *password, size_t length,
|
||||
void *user_data);
|
||||
typedef void gc_peer_join_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id, void *user_data);
|
||||
typedef void gc_peer_exit_cb(const Messenger *m, uint32_t group_number, uint32_t peer_id, unsigned int exit_type,
|
||||
const uint8_t *nick, size_t nick_len, const uint8_t *data, size_t length, void *user_data);
|
||||
typedef void gc_peer_join_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id, void *user_data);
|
||||
typedef void gc_peer_exit_cb(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id, unsigned int exit_type,
|
||||
const uint8_t *name, size_t name_length, const uint8_t *part_message, size_t length,
|
||||
void *user_data);
|
||||
typedef void gc_self_join_cb(const Messenger *m, uint32_t group_number, void *user_data);
|
||||
typedef void gc_rejected_cb(const Messenger *m, uint32_t group_number, unsigned int type, void *user_data);
|
||||
typedef void gc_rejected_cb(const Messenger *m, uint32_t group_number, unsigned int fail_type, void *user_data);
|
||||
|
||||
typedef struct GC_Session {
|
||||
Messenger *messenger;
|
||||
@ -410,4 +428,4 @@ int unpack_gc_saved_peers(GC_Chat *chat, const uint8_t *data, uint16_t length);
|
||||
non_null(1, 2) nullable(4)
|
||||
int pack_gc_saved_peers(const GC_Chat *chat, uint8_t *data, uint16_t length, uint16_t *processed);
|
||||
|
||||
#endif // C_TOXCORE_TOXCORE_GROUP_COMMON_H
|
||||
#endif /* C_TOXCORE_TOXCORE_GROUP_COMMON_H */
|
||||
|
||||
Reference in New Issue
Block a user