Squashed 'external/toxcore/c-toxcore/' changes from 11ab1d2a723..d9b8fa6098d
d9b8fa6098d fix: Fake broadcast address for 127.x.x.x aa649165a57 chore: Add code for future netprof TCP testing 9e5693de5ac chore: add to_string functions for netprof enums 52d915e6a90 cleanup: Heap allocate network profile objects 80fabd4a729 feat: Implement Tox network profiler 05abe083cb6 cleanup: Some random cleanups, mostly related to mem. 5cca24513b8 cleanup: Check that onion IP/Port packing worked. e092ecd1244 cleanup: Use tox memory allocator in some more places. 3cfe41c7587 fix: Avoid `memcpy`-ing structs into onion ping id data. e32ac001938 fix: Add more information on why the frame was not sent. ab887003687 fix: Allow TCP connections to fail `connect` calls. 7603170e663 refactor: Use tox memory in group connection allocations. 5bd8a85eb89 cleanup: Align internal logger with external on type of source line. e9bf524d9e1 cleanup: Add missing `#include` to sort_test.cc. d10c966b998 feat: Add `to_string` functions for toxencryptsave errors. 7bfd0dc8003 docs: Update the docs for group join functions 380dde9f2ae test: Add more logging to TCP connection constructor. 0f12f384c8c cleanup: Reduce stack frame sizes to below 4096 bytes. bc43cec0626 chore: Happy new year! fbe78f1702e cleanup: Add a `TOX_HIDE_DEPRECATED` check to hide deprecated symbols. 44d9da07e77 refactor: Use tox memory for group moderation/pack allocations. 7f26d520168 refactor: Use tox memory in group chats allocations. 2f62f3d0e77 refactor: Use tox Memory for group allocations. 8a968162041 chore: Add dispatch/events headers to bazel export. 2bbfb35abf6 docs: Output the error code string instead of int. in toxav logging d55d0e4eaef cleanup: Remove redundant code for checking if group exists 2a6dc643338 chore: Upgrade dependencies for websockify. fc0650601c1 fix: Allow peers to reconnect to group chats using a password git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: d9b8fa6098de6c074038b6664d2572627540b148
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-or-later
|
||||
* Copyright © 2016-2021 The TokTok team.
|
||||
* Copyright © 2016-2025 The TokTok team.
|
||||
* Copyright © 2013 Tox project.
|
||||
*/
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-or-later
|
||||
* Copyright © 2016-2018 The TokTok team.
|
||||
* Copyright © 2016-2025 The TokTok team.
|
||||
* Copyright © 2013 Tox project.
|
||||
*/
|
||||
|
||||
@ -395,3 +395,63 @@ bool tox_is_data_encrypted(const uint8_t data[TOX_PASS_ENCRYPTION_EXTRA_LENGTH])
|
||||
{
|
||||
return memcmp(data, TOX_ENC_SAVE_MAGIC_NUMBER, TOX_ENC_SAVE_MAGIC_LENGTH) == 0;
|
||||
}
|
||||
|
||||
const char *tox_err_key_derivation_to_string(Tox_Err_Key_Derivation error)
|
||||
{
|
||||
switch (error) {
|
||||
case TOX_ERR_KEY_DERIVATION_OK:
|
||||
return "TOX_ERR_KEY_DERIVATION_OK";
|
||||
case TOX_ERR_KEY_DERIVATION_NULL:
|
||||
return "TOX_ERR_KEY_DERIVATION_NULL";
|
||||
case TOX_ERR_KEY_DERIVATION_FAILED:
|
||||
return "TOX_ERR_KEY_DERIVATION_FAILED";
|
||||
}
|
||||
return "<invalid Tox_Err_Key_Derivation>";
|
||||
}
|
||||
|
||||
const char *tox_err_encryption_to_string(Tox_Err_Encryption error)
|
||||
{
|
||||
switch (error) {
|
||||
case TOX_ERR_ENCRYPTION_OK:
|
||||
return "TOX_ERR_ENCRYPTION_OK";
|
||||
case TOX_ERR_ENCRYPTION_NULL:
|
||||
return "TOX_ERR_ENCRYPTION_NULL";
|
||||
case TOX_ERR_ENCRYPTION_KEY_DERIVATION_FAILED:
|
||||
return "TOX_ERR_ENCRYPTION_KEY_DERIVATION_FAILED";
|
||||
case TOX_ERR_ENCRYPTION_FAILED:
|
||||
return "TOX_ERR_ENCRYPTION_FAILED";
|
||||
}
|
||||
return "<invalid Tox_Err_Encryption>";
|
||||
}
|
||||
|
||||
const char *tox_err_decryption_to_string(Tox_Err_Decryption error)
|
||||
{
|
||||
switch (error) {
|
||||
case TOX_ERR_DECRYPTION_OK:
|
||||
return "TOX_ERR_DECRYPTION_OK";
|
||||
case TOX_ERR_DECRYPTION_NULL:
|
||||
return "TOX_ERR_DECRYPTION_NULL";
|
||||
case TOX_ERR_DECRYPTION_INVALID_LENGTH:
|
||||
return "TOX_ERR_DECRYPTION_INVALID_LENGTH";
|
||||
case TOX_ERR_DECRYPTION_BAD_FORMAT:
|
||||
return "TOX_ERR_DECRYPTION_BAD_FORMAT";
|
||||
case TOX_ERR_DECRYPTION_KEY_DERIVATION_FAILED:
|
||||
return "TOX_ERR_DECRYPTION_KEY_DERIVATION_FAILED";
|
||||
case TOX_ERR_DECRYPTION_FAILED:
|
||||
return "TOX_ERR_DECRYPTION_FAILED";
|
||||
}
|
||||
return "<invalid Tox_Err_Decryption>";
|
||||
}
|
||||
|
||||
const char *tox_err_get_salt_to_string(Tox_Err_Get_Salt error)
|
||||
{
|
||||
switch (error) {
|
||||
case TOX_ERR_GET_SALT_OK:
|
||||
return "TOX_ERR_GET_SALT_OK";
|
||||
case TOX_ERR_GET_SALT_NULL:
|
||||
return "TOX_ERR_GET_SALT_NULL";
|
||||
case TOX_ERR_GET_SALT_BAD_FORMAT:
|
||||
return "TOX_ERR_GET_SALT_BAD_FORMAT";
|
||||
}
|
||||
return "<invalid Tox_Err_Get_Salt>";
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-or-later
|
||||
* Copyright © 2016-2024 The TokTok team.
|
||||
* Copyright © 2016-2025 The TokTok team.
|
||||
* Copyright © 2013-2016 Tox Developers.
|
||||
*/
|
||||
|
||||
@ -88,6 +88,8 @@ typedef enum Tox_Err_Key_Derivation {
|
||||
|
||||
} Tox_Err_Key_Derivation;
|
||||
|
||||
const char *tox_err_key_derivation_to_string(Tox_Err_Key_Derivation error);
|
||||
|
||||
typedef enum Tox_Err_Encryption {
|
||||
|
||||
/**
|
||||
@ -114,6 +116,8 @@ typedef enum Tox_Err_Encryption {
|
||||
|
||||
} Tox_Err_Encryption;
|
||||
|
||||
const char *tox_err_encryption_to_string(Tox_Err_Encryption error);
|
||||
|
||||
typedef enum Tox_Err_Decryption {
|
||||
|
||||
/**
|
||||
@ -152,6 +156,8 @@ typedef enum Tox_Err_Decryption {
|
||||
|
||||
} Tox_Err_Decryption;
|
||||
|
||||
const char *tox_err_decryption_to_string(Tox_Err_Decryption error);
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* BEGIN PART 1
|
||||
@ -313,6 +319,8 @@ typedef enum Tox_Err_Get_Salt {
|
||||
|
||||
} Tox_Err_Get_Salt;
|
||||
|
||||
const char *tox_err_get_salt_to_string(Tox_Err_Get_Salt error);
|
||||
|
||||
/**
|
||||
* Retrieves the salt used to encrypt the given data.
|
||||
*
|
||||
|
Reference in New Issue
Block a user