forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from f1df709b87..8f0d505f9a
8f0d505f9a feat: add ngc events 9b8216e70c refactor: Make event dispatch ordered by receive time. 814c12a6f4 cleanup: Add dynamically derived array sizes to the API. 226b23be12 cleanup: Add explicit array sizes to toxencryptsave. ef33cb4de0 cleanup: Add Toxav alias for ToxAV. 1da723b34d cleanup: Make Tox_Options a typedef. b148a2afff chore: Simplify msvc build using vcpkg. 5cac6d7eb1 cleanup: Move `tox_get_system` out of the public API. c9ca4007e3 refactor: Align group message sending with other send functions. 6c6c0b1b1b cleanup: Make setters take non-const `Tox *`. a76f758d70 cleanup: Mark arrays in the tox API as `[]` instead of `*`. baf6d1f6cf cleanup: Make array params in toxav `[]` instead of `*`. 79f55bd06a cleanup: Put the size of fixed arrays into the API types. 1e73698db2 cleanup: Add typedefs for public API int identifiers. cac074c57f chore: Add fetch-sha256 script to update bootstrap node hash. 32576656bb Make the comment capitalization uniform aff4dda17c Spellcheck tox-bootstrapd 40b5fbbe9d chore: Remove settings.yml in favour of hs-github-tools. ebafd51be7 chore: Use GPL license with https. 0e42752f0f cleanup: Move all vptr-to-ptr casts to the beginning of a function. 5407384211 cleanup: Use github actions matrix to simplify CI. 82d8265688 fix: Use QueryPerformanceCounter on windows for monotonic time. 1224e656e3 chore: Add `net_(new|kill)_strerror` to cppcheck's allocators. 6a90ddfe4e cleanup: Run clang-tidy on headers, as well. bd930cc80a cleanup: Make TCP connection failures a warning instead of error. fad6e4e173 cleanup: Make all .c files include the headers they need. ef4897a898 cleanup: Upgrade to clang-tidy-17 and fix some warnings. REVERT: f1df709b87 feat: add ngc events REVERT: 1b6c907235 refactor: Make event dispatch ordered by receive time. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 8f0d505f9a598cc41c682178e1589bcc01efe9cb
This commit is contained in:
@ -4,7 +4,6 @@
|
||||
#include "tox.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "ccompat.h"
|
||||
#include "tox_private.h"
|
||||
@ -139,33 +138,33 @@ uint32_t tox_dht_node_public_key_size(void)
|
||||
|
||||
//!TOKSTYLE-
|
||||
|
||||
#define ACCESSORS(type, ns, name) \
|
||||
type tox_options_get_##ns##name(const struct Tox_Options *options) \
|
||||
#define ACCESSORS(type, name) \
|
||||
type tox_options_get_##name(const struct Tox_Options *options) \
|
||||
{ \
|
||||
return options->ns##name; \
|
||||
return options->name; \
|
||||
} \
|
||||
void tox_options_set_##ns##name(struct Tox_Options *options, type name) \
|
||||
void tox_options_set_##name(struct Tox_Options *options, type name) \
|
||||
{ \
|
||||
options->ns##name = name; \
|
||||
options->name = name; \
|
||||
}
|
||||
|
||||
ACCESSORS(bool,, ipv6_enabled)
|
||||
ACCESSORS(bool,, udp_enabled)
|
||||
ACCESSORS(Tox_Proxy_Type, proxy_, type)
|
||||
ACCESSORS(const char *, proxy_, host)
|
||||
ACCESSORS(uint16_t, proxy_, port)
|
||||
ACCESSORS(uint16_t,, start_port)
|
||||
ACCESSORS(uint16_t,, end_port)
|
||||
ACCESSORS(uint16_t,, tcp_port)
|
||||
ACCESSORS(bool,, hole_punching_enabled)
|
||||
ACCESSORS(Tox_Savedata_Type, savedata_, type)
|
||||
ACCESSORS(size_t, savedata_, length)
|
||||
ACCESSORS(tox_log_cb *, log_, callback)
|
||||
ACCESSORS(void *, log_, user_data)
|
||||
ACCESSORS(bool,, local_discovery_enabled)
|
||||
ACCESSORS(bool,, dht_announcements_enabled)
|
||||
ACCESSORS(bool,, experimental_thread_safety)
|
||||
ACCESSORS(const Tox_System *,, operating_system)
|
||||
ACCESSORS(bool, ipv6_enabled)
|
||||
ACCESSORS(bool, udp_enabled)
|
||||
ACCESSORS(Tox_Proxy_Type, proxy_type)
|
||||
ACCESSORS(const char *, proxy_host)
|
||||
ACCESSORS(uint16_t, proxy_port)
|
||||
ACCESSORS(uint16_t, start_port)
|
||||
ACCESSORS(uint16_t, end_port)
|
||||
ACCESSORS(uint16_t, tcp_port)
|
||||
ACCESSORS(bool, hole_punching_enabled)
|
||||
ACCESSORS(Tox_Savedata_Type, savedata_type)
|
||||
ACCESSORS(size_t, savedata_length)
|
||||
ACCESSORS(tox_log_cb *, log_callback)
|
||||
ACCESSORS(void *, log_user_data)
|
||||
ACCESSORS(bool, local_discovery_enabled)
|
||||
ACCESSORS(bool, dht_announcements_enabled)
|
||||
ACCESSORS(bool, experimental_thread_safety)
|
||||
ACCESSORS(const Tox_System *, operating_system)
|
||||
|
||||
//!TOKSTYLE+
|
||||
|
||||
@ -174,9 +173,9 @@ const uint8_t *tox_options_get_savedata_data(const struct Tox_Options *options)
|
||||
return options->savedata_data;
|
||||
}
|
||||
|
||||
void tox_options_set_savedata_data(struct Tox_Options *options, const uint8_t *data, size_t length)
|
||||
void tox_options_set_savedata_data(struct Tox_Options *options, const uint8_t *savedata_data, size_t length)
|
||||
{
|
||||
options->savedata_data = data;
|
||||
options->savedata_data = savedata_data;
|
||||
options->savedata_length = length;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user