forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from d9b8fa6098d..81b1e4f6348
81b1e4f6348 chore: Release v0.2.21-rc.1 9303e2e49a1 chore: Update the pkgsrc versions in the update-versions tool 71ec4b3b1e9 chore: Update the version-sync script to work in a post-tox.api.h world 66da842f753 chore: Add version update script compatible with ci-tools. 199878f7660 chore: Use new bazel script for circle ci. 8278e9cda46 chore: Add release issue template and workflow. a9bb3a1c4d1 chore: Fix alpine-s390x build. 6e0a641272e chore: Add a source tarball deploy workflow. 4adebe4d8b1 chore: Don't upload ios/macos variants in deploy workflows. 18f1d858ccb chore: Move one of the 3 freebsd builds to post-submit. 432ab60c002 feat: Add a Makefile for the single file deploy build. a86c0011fd5 chore: Add deploy job for single C file library. 2e7495e8f2a docs: Update changelog format to use the new clog-compatible way. a682da99e84 chore: Export wasmExports from the wasm binary. 12f34cdff27 chore: Add wasm to the nightly binary deploys. 1451029613f chore: Add strict-abi support for macOS/iOS. c53c30e09d9 chore: Add time option to manual fuzz trigger. 2ccecdc2a1a chore: Add remaining fuzz tests to cflite. 4626c2e230e test: Add a Net_Crypto fuzz test. b4a0e617c48 refactor: Use IP string length from ip_ntoa instead of strlen. b85b91f22f6 cleanup: rename getnodes/sendnodes to nodes request/response This change alignes the naming to be closer to the spec and make it less ambiguous. This change also changes the naming of some private/experimental marked APIs. - tox_callback_dht_nodes_response() - tox_dht_nodes_request() - Tox_Event_Dht_Get_Nodes_Response f1991aaa029 perf: Use stack allocation for strerror rendering. 3984211ccbf cleanup: remove kicked peers from saved peers list 26a991ed2be fix: ip to string function not accepting tcp families 712861f2e6d cleanup: Make websockify output qtox-compatible logging. 01932ea2f73 chore: Add opus and vpx to the toxcore wasm build. d29c42ef631 refactor: don't fully discard received DHT nodes. This is mostly forward thinking, where we might introduce other ip families, in addition to ipv4, ipv6, tcp_ipv4 etc. 21e2325934f chore: Fix xcframework tarball creation. b10c8b766ba chore: Fix xcframework checksum creation. 93787a9322e chore: Add ios/macos framework build. 9f723f891d3 fix: run do_gca also in bootstrap nodes 496cc703556 chore: Support arm64 iphone simulator. aa0e2a8e928 chore: Add support for more iOS architectures. 13ad8e81cbf chore: Add binary deploy workflows. c8344726378 refactor: Move tox_log_level out into its own file. 8799bea76c3 cleanup: Mark events/dispatch headers as experimental. d4164edb548 refactor: Remove tox_types.h; use `struct` tags instead. d408c982090 refactor: Move `Tox_Options` to `tox_options.h`. 5ab42d41209 chore: Move most cirrus jobs to circleci. 463eeae1144 cleanup: Avoid clashing with global define `DEBUG`. 92cc1e91747 refactor: Make Tox_Options own the passed proxy host and savedata. f276b397226 test: Add some more asserts for I/O and alloc to succeed. edb4dfc4869 fix: Don't crash on malloc failures in bin_unpack. be457d5d0b2 cleanup: Use tox memory for bin_unpack and net_strerror. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 81b1e4f6348124784088591c4fe9ab41e273031d
This commit is contained in:
Green Sky
@ -1,20 +1,11 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-or-later
|
||||
* Copyright © 2016-2025 The TokTok team.
|
||||
*/
|
||||
#include "tox.h"
|
||||
#include "tox.h" // IWYU pragma: associated
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "ccompat.h"
|
||||
#include "tox_options.h"
|
||||
#include "tox_private.h"
|
||||
|
||||
#define SET_ERROR_PARAMETER(param, x) \
|
||||
do { \
|
||||
if (param != nullptr) { \
|
||||
*param = x; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
uint32_t tox_version_major(void)
|
||||
{
|
||||
return TOX_VERSION_MAJOR;
|
||||
@ -136,200 +127,6 @@ uint32_t tox_dht_node_public_key_size(void)
|
||||
return TOX_DHT_NODE_PUBLIC_KEY_SIZE;
|
||||
}
|
||||
|
||||
bool tox_options_get_ipv6_enabled(const Tox_Options *options)
|
||||
{
|
||||
return options->ipv6_enabled;
|
||||
}
|
||||
void tox_options_set_ipv6_enabled(Tox_Options *options, bool ipv6_enabled)
|
||||
{
|
||||
options->ipv6_enabled = ipv6_enabled;
|
||||
}
|
||||
bool tox_options_get_udp_enabled(const Tox_Options *options)
|
||||
{
|
||||
return options->udp_enabled;
|
||||
}
|
||||
void tox_options_set_udp_enabled(Tox_Options *options, bool udp_enabled)
|
||||
{
|
||||
options->udp_enabled = udp_enabled;
|
||||
}
|
||||
Tox_Proxy_Type tox_options_get_proxy_type(const Tox_Options *options)
|
||||
{
|
||||
return options->proxy_type;
|
||||
}
|
||||
void tox_options_set_proxy_type(Tox_Options *options, Tox_Proxy_Type proxy_type)
|
||||
{
|
||||
options->proxy_type = proxy_type;
|
||||
}
|
||||
const char *tox_options_get_proxy_host(const Tox_Options *options)
|
||||
{
|
||||
return options->proxy_host;
|
||||
}
|
||||
void tox_options_set_proxy_host(Tox_Options *options, const char *proxy_host)
|
||||
{
|
||||
options->proxy_host = proxy_host;
|
||||
}
|
||||
uint16_t tox_options_get_proxy_port(const Tox_Options *options)
|
||||
{
|
||||
return options->proxy_port;
|
||||
}
|
||||
void tox_options_set_proxy_port(Tox_Options *options, uint16_t proxy_port)
|
||||
{
|
||||
options->proxy_port = proxy_port;
|
||||
}
|
||||
uint16_t tox_options_get_start_port(const Tox_Options *options)
|
||||
{
|
||||
return options->start_port;
|
||||
}
|
||||
void tox_options_set_start_port(Tox_Options *options, uint16_t start_port)
|
||||
{
|
||||
options->start_port = start_port;
|
||||
}
|
||||
uint16_t tox_options_get_end_port(const Tox_Options *options)
|
||||
{
|
||||
return options->end_port;
|
||||
}
|
||||
void tox_options_set_end_port(Tox_Options *options, uint16_t end_port)
|
||||
{
|
||||
options->end_port = end_port;
|
||||
}
|
||||
uint16_t tox_options_get_tcp_port(const Tox_Options *options)
|
||||
{
|
||||
return options->tcp_port;
|
||||
}
|
||||
void tox_options_set_tcp_port(Tox_Options *options, uint16_t tcp_port)
|
||||
{
|
||||
options->tcp_port = tcp_port;
|
||||
}
|
||||
bool tox_options_get_hole_punching_enabled(const Tox_Options *options)
|
||||
{
|
||||
return options->hole_punching_enabled;
|
||||
}
|
||||
void tox_options_set_hole_punching_enabled(Tox_Options *options, bool hole_punching_enabled)
|
||||
{
|
||||
options->hole_punching_enabled = hole_punching_enabled;
|
||||
}
|
||||
Tox_Savedata_Type tox_options_get_savedata_type(const Tox_Options *options)
|
||||
{
|
||||
return options->savedata_type;
|
||||
}
|
||||
void tox_options_set_savedata_type(Tox_Options *options, Tox_Savedata_Type savedata_type)
|
||||
{
|
||||
options->savedata_type = savedata_type;
|
||||
}
|
||||
size_t tox_options_get_savedata_length(const Tox_Options *options)
|
||||
{
|
||||
return options->savedata_length;
|
||||
}
|
||||
void tox_options_set_savedata_length(Tox_Options *options, size_t savedata_length)
|
||||
{
|
||||
options->savedata_length = savedata_length;
|
||||
}
|
||||
tox_log_cb *tox_options_get_log_callback(const Tox_Options *options)
|
||||
{
|
||||
return options->log_callback;
|
||||
}
|
||||
void tox_options_set_log_callback(Tox_Options *options, tox_log_cb *log_callback)
|
||||
{
|
||||
options->log_callback = log_callback;
|
||||
}
|
||||
void *tox_options_get_log_user_data(const Tox_Options *options)
|
||||
{
|
||||
return options->log_user_data;
|
||||
}
|
||||
void tox_options_set_log_user_data(Tox_Options *options, void *log_user_data)
|
||||
{
|
||||
options->log_user_data = log_user_data;
|
||||
}
|
||||
bool tox_options_get_local_discovery_enabled(const Tox_Options *options)
|
||||
{
|
||||
return options->local_discovery_enabled;
|
||||
}
|
||||
void tox_options_set_local_discovery_enabled(Tox_Options *options, bool local_discovery_enabled)
|
||||
{
|
||||
options->local_discovery_enabled = local_discovery_enabled;
|
||||
}
|
||||
bool tox_options_get_dht_announcements_enabled(const Tox_Options *options)
|
||||
{
|
||||
return options->dht_announcements_enabled;
|
||||
}
|
||||
void tox_options_set_dht_announcements_enabled(Tox_Options *options, bool dht_announcements_enabled)
|
||||
{
|
||||
options->dht_announcements_enabled = dht_announcements_enabled;
|
||||
}
|
||||
bool tox_options_get_experimental_thread_safety(const Tox_Options *options)
|
||||
{
|
||||
return options->experimental_thread_safety;
|
||||
}
|
||||
void tox_options_set_experimental_thread_safety(
|
||||
Tox_Options *options, bool experimental_thread_safety)
|
||||
{
|
||||
options->experimental_thread_safety = experimental_thread_safety;
|
||||
}
|
||||
bool tox_options_get_experimental_groups_persistence(const Tox_Options *options)
|
||||
{
|
||||
return options->experimental_groups_persistence;
|
||||
}
|
||||
void tox_options_set_experimental_groups_persistence(
|
||||
Tox_Options *options, bool experimental_groups_persistence)
|
||||
{
|
||||
options->experimental_groups_persistence = experimental_groups_persistence;
|
||||
}
|
||||
bool tox_options_get_experimental_disable_dns(const Tox_Options *options)
|
||||
{
|
||||
return options->experimental_disable_dns;
|
||||
}
|
||||
void tox_options_set_experimental_disable_dns(Tox_Options *options, bool experimental_disable_dns)
|
||||
{
|
||||
options->experimental_disable_dns = experimental_disable_dns;
|
||||
}
|
||||
|
||||
const uint8_t *tox_options_get_savedata_data(const Tox_Options *options)
|
||||
{
|
||||
return options->savedata_data;
|
||||
}
|
||||
|
||||
void tox_options_set_savedata_data(Tox_Options *options, const uint8_t *savedata_data, size_t length)
|
||||
{
|
||||
options->savedata_data = savedata_data;
|
||||
options->savedata_length = length;
|
||||
}
|
||||
|
||||
void tox_options_default(Tox_Options *options)
|
||||
{
|
||||
if (options != nullptr) {
|
||||
const Tox_Options default_options = {false};
|
||||
*options = default_options;
|
||||
tox_options_set_ipv6_enabled(options, true);
|
||||
tox_options_set_udp_enabled(options, true);
|
||||
tox_options_set_proxy_type(options, TOX_PROXY_TYPE_NONE);
|
||||
tox_options_set_hole_punching_enabled(options, true);
|
||||
tox_options_set_local_discovery_enabled(options, true);
|
||||
tox_options_set_dht_announcements_enabled(options, true);
|
||||
tox_options_set_experimental_thread_safety(options, false);
|
||||
tox_options_set_experimental_groups_persistence(options, false);
|
||||
tox_options_set_experimental_disable_dns(options, false);
|
||||
}
|
||||
}
|
||||
|
||||
Tox_Options *tox_options_new(Tox_Err_Options_New *error)
|
||||
{
|
||||
Tox_Options *options = (Tox_Options *)calloc(1, sizeof(Tox_Options));
|
||||
|
||||
if (options != nullptr) {
|
||||
tox_options_default(options);
|
||||
SET_ERROR_PARAMETER(error, TOX_ERR_OPTIONS_NEW_OK);
|
||||
return options;
|
||||
}
|
||||
|
||||
SET_ERROR_PARAMETER(error, TOX_ERR_OPTIONS_NEW_MALLOC);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void tox_options_free(Tox_Options *options)
|
||||
{
|
||||
free(options);
|
||||
}
|
||||
|
||||
const char *tox_user_status_to_string(Tox_User_Status value)
|
||||
{
|
||||
switch (value) {
|
||||
@ -387,27 +184,6 @@ const char *tox_savedata_type_to_string(Tox_Savedata_Type value)
|
||||
|
||||
return "<invalid Tox_Savedata_Type>";
|
||||
}
|
||||
const char *tox_log_level_to_string(Tox_Log_Level value)
|
||||
{
|
||||
switch (value) {
|
||||
case TOX_LOG_LEVEL_TRACE:
|
||||
return "TOX_LOG_LEVEL_TRACE";
|
||||
|
||||
case TOX_LOG_LEVEL_DEBUG:
|
||||
return "TOX_LOG_LEVEL_DEBUG";
|
||||
|
||||
case TOX_LOG_LEVEL_INFO:
|
||||
return "TOX_LOG_LEVEL_INFO";
|
||||
|
||||
case TOX_LOG_LEVEL_WARNING:
|
||||
return "TOX_LOG_LEVEL_WARNING";
|
||||
|
||||
case TOX_LOG_LEVEL_ERROR:
|
||||
return "TOX_LOG_LEVEL_ERROR";
|
||||
}
|
||||
|
||||
return "<invalid Tox_Log_Level>";
|
||||
}
|
||||
const char *tox_err_options_new_to_string(Tox_Err_Options_New value)
|
||||
{
|
||||
switch (value) {
|
||||
|
||||
Reference in New Issue
Block a user