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:
@ -16,8 +16,10 @@
|
||||
#include "DHT.h"
|
||||
#include "LAN_discovery.h"
|
||||
#include "TCP_connection.h"
|
||||
#include "attributes.h"
|
||||
#include "ccompat.h"
|
||||
#include "crypto_core.h"
|
||||
#include "group_announce.h"
|
||||
#include "group_onion_announce.h"
|
||||
#include "logger.h"
|
||||
#include "mem.h"
|
||||
@ -27,6 +29,7 @@
|
||||
#include "onion.h"
|
||||
#include "onion_announce.h"
|
||||
#include "ping_array.h"
|
||||
#include "timed_auth.h"
|
||||
#include "util.h"
|
||||
|
||||
/** @brief defines for the array size and timeout for onion announce packets. */
|
||||
@ -480,17 +483,6 @@ static int random_path(const Onion_Client *onion_c, Onion_Client_Paths *onion_pa
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** Does path with path_num exist. */
|
||||
non_null()
|
||||
static bool path_exists(const Mono_Time *mono_time, const Onion_Client_Paths *onion_paths, uint32_t path_num)
|
||||
{
|
||||
if (path_timed_out(mono_time, onion_paths, path_num)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return onion_paths->paths[path_num % NUMBER_ONION_PATHS].path_num == path_num;
|
||||
}
|
||||
|
||||
/** Set path timeouts, return the path number. */
|
||||
non_null()
|
||||
static uint32_t set_path_timeouts(Onion_Client *onion_c, uint32_t num, uint32_t path_num)
|
||||
@ -1066,7 +1058,8 @@ static int handle_announce_response_old(void *object, const IP_Port *source, con
|
||||
return 1;
|
||||
}
|
||||
|
||||
VLA(uint8_t, plain, 1 + ONION_PING_ID_SIZE + len_nodes);
|
||||
const uint16_t plain_size = 1 + ONION_PING_ID_SIZE + len_nodes;
|
||||
VLA(uint8_t, plain, plain_size);
|
||||
int len;
|
||||
const uint16_t nonce_start = 1 + ONION_ANNOUNCE_SENDBACK_DATA_LENGTH;
|
||||
const uint16_t ciphertext_start = nonce_start + CRYPTO_NONCE_SIZE;
|
||||
@ -1090,8 +1083,8 @@ static int handle_announce_response_old(void *object, const IP_Port *source, con
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ((uint32_t)len != SIZEOF_VLA(plain)) {
|
||||
LOGGER_WARNING(onion_c->logger, "decrypted size (%lu) is not the expected plain text size (%lu)", (unsigned long)len, (unsigned long)SIZEOF_VLA(plain));
|
||||
if ((uint32_t)len != plain_size) {
|
||||
LOGGER_WARNING(onion_c->logger, "decrypted size (%lu) is not the expected plain text size (%u)", (unsigned long)len, plain_size);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -1141,21 +1134,23 @@ static int handle_data_response(void *object, const IP_Port *source, const uint8
|
||||
return 1;
|
||||
}
|
||||
|
||||
VLA(uint8_t, temp_plain, length - ONION_DATA_RESPONSE_MIN_SIZE);
|
||||
const uint16_t temp_plain_size = length - ONION_DATA_RESPONSE_MIN_SIZE;
|
||||
VLA(uint8_t, temp_plain, temp_plain_size);
|
||||
int len = decrypt_data(packet + 1 + CRYPTO_NONCE_SIZE, onion_c->temp_secret_key, packet + 1,
|
||||
packet + 1 + CRYPTO_NONCE_SIZE + CRYPTO_PUBLIC_KEY_SIZE,
|
||||
length - (1 + CRYPTO_NONCE_SIZE + CRYPTO_PUBLIC_KEY_SIZE), temp_plain);
|
||||
|
||||
if ((uint32_t)len != SIZEOF_VLA(temp_plain)) {
|
||||
if ((uint32_t)len != temp_plain_size) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
VLA(uint8_t, plain, SIZEOF_VLA(temp_plain) - DATA_IN_RESPONSE_MIN_SIZE);
|
||||
const uint16_t plain_size = temp_plain_size - DATA_IN_RESPONSE_MIN_SIZE;
|
||||
VLA(uint8_t, plain, plain_size);
|
||||
len = decrypt_data(temp_plain, nc_get_self_secret_key(onion_c->c),
|
||||
packet + 1, temp_plain + CRYPTO_PUBLIC_KEY_SIZE,
|
||||
SIZEOF_VLA(temp_plain) - CRYPTO_PUBLIC_KEY_SIZE, plain);
|
||||
temp_plain_size - CRYPTO_PUBLIC_KEY_SIZE, plain);
|
||||
|
||||
if ((uint32_t)len != SIZEOF_VLA(plain)) {
|
||||
if ((uint32_t)len != plain_size) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -1164,7 +1159,7 @@ static int handle_data_response(void *object, const IP_Port *source, const uint8
|
||||
}
|
||||
|
||||
return onion_c->onion_data_handlers[plain[0]].function(onion_c->onion_data_handlers[plain[0]].object, temp_plain, plain,
|
||||
SIZEOF_VLA(plain), userdata);
|
||||
plain_size, userdata);
|
||||
}
|
||||
|
||||
#define DHTPK_DATA_MIN_LENGTH (1 + sizeof(uint64_t) + CRYPTO_PUBLIC_KEY_SIZE)
|
||||
@ -1307,13 +1302,14 @@ int send_onion_data(Onion_Client *onion_c, int friend_num, const uint8_t *data,
|
||||
uint8_t nonce[CRYPTO_NONCE_SIZE];
|
||||
random_nonce(onion_c->rng, nonce);
|
||||
|
||||
VLA(uint8_t, packet, DATA_IN_RESPONSE_MIN_SIZE + length);
|
||||
const uint16_t packet_size = DATA_IN_RESPONSE_MIN_SIZE + length;
|
||||
VLA(uint8_t, packet, packet_size);
|
||||
memcpy(packet, nc_get_self_public_key(onion_c->c), CRYPTO_PUBLIC_KEY_SIZE);
|
||||
int len = encrypt_data(onion_c->friends_list[friend_num].real_public_key,
|
||||
nc_get_self_secret_key(onion_c->c), nonce, data,
|
||||
length, packet + CRYPTO_PUBLIC_KEY_SIZE);
|
||||
|
||||
if ((uint32_t)len + CRYPTO_PUBLIC_KEY_SIZE != SIZEOF_VLA(packet)) {
|
||||
if ((uint32_t)len + CRYPTO_PUBLIC_KEY_SIZE != packet_size) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -1329,7 +1325,7 @@ int send_onion_data(Onion_Client *onion_c, int friend_num, const uint8_t *data,
|
||||
uint8_t o_packet[ONION_MAX_PACKET_SIZE];
|
||||
len = create_data_request(
|
||||
onion_c->rng, o_packet, sizeof(o_packet), onion_c->friends_list[friend_num].real_public_key,
|
||||
node_list[good_nodes[i]].data_public_key, nonce, packet, SIZEOF_VLA(packet));
|
||||
node_list[good_nodes[i]].data_public_key, nonce, packet, packet_size);
|
||||
|
||||
if (len == -1) {
|
||||
continue;
|
||||
@ -1364,21 +1360,22 @@ static int send_dht_dhtpk(const Onion_Client *onion_c, int friend_num, const uin
|
||||
uint8_t nonce[CRYPTO_NONCE_SIZE];
|
||||
random_nonce(onion_c->rng, nonce);
|
||||
|
||||
VLA(uint8_t, temp, DATA_IN_RESPONSE_MIN_SIZE + CRYPTO_NONCE_SIZE + length);
|
||||
const uint16_t temp_size = DATA_IN_RESPONSE_MIN_SIZE + CRYPTO_NONCE_SIZE + length;
|
||||
VLA(uint8_t, temp, temp_size);
|
||||
memcpy(temp, nc_get_self_public_key(onion_c->c), CRYPTO_PUBLIC_KEY_SIZE);
|
||||
memcpy(temp + CRYPTO_PUBLIC_KEY_SIZE, nonce, CRYPTO_NONCE_SIZE);
|
||||
int len = encrypt_data(onion_c->friends_list[friend_num].real_public_key,
|
||||
nc_get_self_secret_key(onion_c->c), nonce, data,
|
||||
length, temp + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_NONCE_SIZE);
|
||||
|
||||
if ((uint32_t)len + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_NONCE_SIZE != SIZEOF_VLA(temp)) {
|
||||
if ((uint32_t)len + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_NONCE_SIZE != temp_size) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
uint8_t packet_data[MAX_CRYPTO_REQUEST_SIZE];
|
||||
len = create_request(
|
||||
onion_c->rng, dht_get_self_public_key(onion_c->dht), dht_get_self_secret_key(onion_c->dht), packet_data,
|
||||
onion_c->friends_list[friend_num].dht_public_key, temp, SIZEOF_VLA(temp), CRYPTO_PACKET_DHTPK);
|
||||
onion_c->friends_list[friend_num].dht_public_key, temp, temp_size, CRYPTO_PACKET_DHTPK);
|
||||
assert(len <= UINT16_MAX);
|
||||
const Packet packet = {packet_data, (uint16_t)len};
|
||||
|
||||
@ -1578,7 +1575,7 @@ int onion_delfriend(Onion_Client *onion_c, int friend_num)
|
||||
dht_delfriend(onion_c->dht, onion_c->friends_list[friend_num].dht_public_key, 0);
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif /* 0 */
|
||||
|
||||
crypto_memzero(&onion_c->friends_list[friend_num], sizeof(Onion_Friend));
|
||||
unsigned int i;
|
||||
@ -1706,7 +1703,6 @@ int onion_getfriendip(const Onion_Client *onion_c, int friend_num, IP_Port *ip_p
|
||||
return dht_getfriendip(onion_c->dht, dht_public_key, ip_port);
|
||||
}
|
||||
|
||||
|
||||
/** @brief Set if friend is online or not.
|
||||
*
|
||||
* NOTE: This function is there and should be used so that we don't send
|
||||
@ -1879,7 +1875,6 @@ static void do_friend(Onion_Client *onion_c, uint16_t friendnum)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** Function to call when onion data packet with contents beginning with byte is received. */
|
||||
void oniondata_registerhandler(Onion_Client *onion_c, uint8_t byte, oniondata_handler_cb *cb, void *object)
|
||||
{
|
||||
@ -1911,6 +1906,33 @@ static bool key_list_contains(const uint8_t *const *keys, uint16_t keys_size, co
|
||||
return false;
|
||||
}
|
||||
|
||||
/** Does path with path_num exist. */
|
||||
non_null()
|
||||
static bool path_exists(const Mono_Time *mono_time, const Onion_Client_Paths *onion_paths, uint32_t path_num)
|
||||
{
|
||||
if (path_timed_out(mono_time, onion_paths, path_num)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return onion_paths->paths[path_num % NUMBER_ONION_PATHS].path_num == path_num;
|
||||
}
|
||||
|
||||
/**
|
||||
* A node/path is considered "stable" if it has survived for at least TIME_TO_STABLE
|
||||
* and the latest packets sent to it are not timing out.
|
||||
*/
|
||||
non_null()
|
||||
static bool path_is_stable(const Mono_Time *mono_time, const Onion_Client_Paths *paths,
|
||||
uint32_t pathnum, const Onion_Node *node)
|
||||
{
|
||||
return mono_time_is_timeout(mono_time, node->added_time, TIME_TO_STABLE)
|
||||
&& !(node->pings_since_last_response > 0
|
||||
&& mono_time_is_timeout(mono_time, node->last_pinged, ONION_NODE_TIMEOUT))
|
||||
&& mono_time_is_timeout(mono_time, paths->path_creation_time[pathnum], TIME_TO_STABLE)
|
||||
&& !(paths->last_path_used_times[pathnum] > 0
|
||||
&& mono_time_is_timeout(mono_time, paths->last_path_used[pathnum], ONION_PATH_TIMEOUT));
|
||||
}
|
||||
|
||||
non_null()
|
||||
static void do_announce(Onion_Client *onion_c)
|
||||
{
|
||||
@ -1934,7 +1956,6 @@ static void do_announce(Onion_Client *onion_c)
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
unsigned int interval = ANNOUNCE_INTERVAL_NOT_ANNOUNCED;
|
||||
|
||||
if (node_list[i].is_stored != 0
|
||||
@ -1943,16 +1964,8 @@ static void do_announce(Onion_Client *onion_c)
|
||||
|
||||
const uint32_t pathnum = node_list[i].path_used % NUMBER_ONION_PATHS;
|
||||
|
||||
/* A node/path is considered "stable", and can be pinged less
|
||||
* aggressively, if it has survived for at least TIME_TO_STABLE
|
||||
* and the latest packets sent to it are not timing out.
|
||||
*/
|
||||
if (mono_time_is_timeout(onion_c->mono_time, node_list[i].added_time, TIME_TO_STABLE)
|
||||
&& !(node_list[i].pings_since_last_response > 0
|
||||
&& mono_time_is_timeout(onion_c->mono_time, node_list[i].last_pinged, ONION_NODE_TIMEOUT))
|
||||
&& mono_time_is_timeout(onion_c->mono_time, onion_c->onion_paths_self.path_creation_time[pathnum], TIME_TO_STABLE)
|
||||
&& !(onion_c->onion_paths_self.last_path_used_times[pathnum] > 0
|
||||
&& mono_time_is_timeout(onion_c->mono_time, onion_c->onion_paths_self.last_path_used[pathnum], ONION_PATH_TIMEOUT))) {
|
||||
/* If a node/path is considered "stable", it can be pinged less aggressively. */
|
||||
if (path_is_stable(onion_c->mono_time, &onion_c->onion_paths_self, pathnum, &node_list[i])) {
|
||||
interval = ANNOUNCE_INTERVAL_STABLE;
|
||||
}
|
||||
}
|
||||
@ -2021,7 +2034,7 @@ static void do_announce(Onion_Client *onion_c)
|
||||
} else {
|
||||
Ip_Ntoa ip_str;
|
||||
LOGGER_TRACE(onion_c->logger, "not sending repeated announce request to %s:%d",
|
||||
net_ip_ntoa(&target->ip_port.ip, &ip_str), net_ntohs(target->ip_port.port));
|
||||
net_ip_ntoa(&target->ip_port.ip, &ip_str), net_ntohs(target->ip_port.port));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user