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:
@ -13,6 +13,8 @@
|
||||
#include <stddef.h> // size_t
|
||||
#include <stdint.h> // uint*_t
|
||||
|
||||
#include "attributes.h"
|
||||
#include "bin_pack.h"
|
||||
#include "logger.h"
|
||||
#include "mem.h"
|
||||
|
||||
@ -25,19 +27,27 @@ extern "C" {
|
||||
*/
|
||||
typedef struct Network_Addr Network_Addr;
|
||||
|
||||
typedef int net_close_cb(void *obj, int sock);
|
||||
typedef int net_accept_cb(void *obj, int sock);
|
||||
typedef int net_bind_cb(void *obj, int sock, const Network_Addr *addr);
|
||||
typedef int net_listen_cb(void *obj, int sock, int backlog);
|
||||
typedef int net_recvbuf_cb(void *obj, int sock);
|
||||
typedef int net_recv_cb(void *obj, int sock, uint8_t *buf, size_t len);
|
||||
typedef int net_recvfrom_cb(void *obj, int sock, uint8_t *buf, size_t len, Network_Addr *addr);
|
||||
typedef int net_send_cb(void *obj, int sock, const uint8_t *buf, size_t len);
|
||||
typedef int net_sendto_cb(void *obj, int sock, const uint8_t *buf, size_t len, const Network_Addr *addr);
|
||||
typedef int net_socket_cb(void *obj, int domain, int type, int proto);
|
||||
typedef int net_socket_nonblock_cb(void *obj, int sock, bool nonblock);
|
||||
typedef int net_getsockopt_cb(void *obj, int sock, int level, int optname, void *optval, size_t *optlen);
|
||||
typedef int net_setsockopt_cb(void *obj, int sock, int level, int optname, const void *optval, size_t optlen);
|
||||
typedef bitwise int Socket_Value;
|
||||
typedef struct Socket {
|
||||
Socket_Value value;
|
||||
} Socket;
|
||||
|
||||
int net_socket_to_native(Socket sock);
|
||||
Socket net_socket_from_native(int sock);
|
||||
|
||||
typedef int net_close_cb(void *obj, Socket sock);
|
||||
typedef Socket net_accept_cb(void *obj, Socket sock);
|
||||
typedef int net_bind_cb(void *obj, Socket sock, const Network_Addr *addr);
|
||||
typedef int net_listen_cb(void *obj, Socket sock, int backlog);
|
||||
typedef int net_recvbuf_cb(void *obj, Socket sock);
|
||||
typedef int net_recv_cb(void *obj, Socket sock, uint8_t *buf, size_t len);
|
||||
typedef int net_recvfrom_cb(void *obj, Socket sock, uint8_t *buf, size_t len, Network_Addr *addr);
|
||||
typedef int net_send_cb(void *obj, Socket sock, const uint8_t *buf, size_t len);
|
||||
typedef int net_sendto_cb(void *obj, Socket sock, const uint8_t *buf, size_t len, const Network_Addr *addr);
|
||||
typedef Socket net_socket_cb(void *obj, int domain, int type, int proto);
|
||||
typedef int net_socket_nonblock_cb(void *obj, Socket sock, bool nonblock);
|
||||
typedef int net_getsockopt_cb(void *obj, Socket sock, int level, int optname, void *optval, size_t *optlen);
|
||||
typedef int net_setsockopt_cb(void *obj, Socket sock, int level, int optname, const void *optval, size_t optlen);
|
||||
typedef int net_getaddrinfo_cb(void *obj, int family, Network_Addr **addrs);
|
||||
typedef int net_freeaddrinfo_cb(void *obj, Network_Addr *addrs);
|
||||
|
||||
@ -69,7 +79,7 @@ typedef struct Network {
|
||||
void *obj;
|
||||
} Network;
|
||||
|
||||
const Network *system_network(void);
|
||||
const Network *os_network(void);
|
||||
|
||||
typedef struct Family {
|
||||
uint8_t value;
|
||||
@ -146,7 +156,6 @@ typedef enum Net_Packet_Type {
|
||||
NET_PACKET_MAX = 0xff, /* This type must remain within a single uint8. */
|
||||
} Net_Packet_Type;
|
||||
|
||||
|
||||
#define TOX_PORTRANGE_FROM 33445
|
||||
#define TOX_PORTRANGE_TO 33545
|
||||
#define TOX_PORT_DEFAULT TOX_PORTRANGE_FROM
|
||||
@ -210,10 +219,6 @@ typedef struct IP_Port {
|
||||
uint16_t port;
|
||||
} IP_Port;
|
||||
|
||||
typedef struct Socket {
|
||||
int sock;
|
||||
} Socket;
|
||||
|
||||
non_null()
|
||||
Socket net_socket(const Network *ns, Family domain, int type, int protocol);
|
||||
|
||||
@ -337,7 +342,7 @@ non_null()
|
||||
bool addr_parse_ip(const char *address, IP *to);
|
||||
|
||||
/**
|
||||
* Compares two IPAny structures.
|
||||
* Compares two IP structures.
|
||||
*
|
||||
* Unset means unequal.
|
||||
*
|
||||
@ -347,7 +352,7 @@ nullable(1, 2)
|
||||
bool ip_equal(const IP *a, const IP *b);
|
||||
|
||||
/**
|
||||
* Compares two IPAny_Port structures.
|
||||
* Compares two IP_Port structures.
|
||||
*
|
||||
* Unset means unequal.
|
||||
*
|
||||
@ -356,6 +361,18 @@ bool ip_equal(const IP *a, const IP *b);
|
||||
nullable(1, 2)
|
||||
bool ipport_equal(const IP_Port *a, const IP_Port *b);
|
||||
|
||||
/**
|
||||
* @brief IP_Port comparison function with `memcmp` signature.
|
||||
*
|
||||
* Casts the void pointers to `IP_Port *` for comparison.
|
||||
*
|
||||
* @retval -1 if `a < b`
|
||||
* @retval 0 if `a == b`
|
||||
* @retval 1 if `a > b`
|
||||
*/
|
||||
non_null()
|
||||
int ipport_cmp_handler(const void *a, const void *b, size_t size);
|
||||
|
||||
/** nulls out ip */
|
||||
non_null()
|
||||
void ip_reset(IP *ip);
|
||||
@ -399,7 +416,7 @@ bool addr_resolve_or_parse_ip(const Network *ns, const char *address, IP *to, IP
|
||||
* Packet data is put into data.
|
||||
* Packet length is put into length.
|
||||
*/
|
||||
typedef int packet_handler_cb(void *object, const IP_Port *ip_port, const uint8_t *data, uint16_t len, void *userdata);
|
||||
typedef int packet_handler_cb(void *object, const IP_Port *source, const uint8_t *packet, uint16_t length, void *userdata);
|
||||
|
||||
typedef struct Networking_Core Networking_Core;
|
||||
|
||||
@ -506,6 +523,29 @@ int32_t net_getipport(const Memory *mem, const char *node, IP_Port **res, int to
|
||||
non_null(1) nullable(2)
|
||||
void net_freeipport(const Memory *mem, IP_Port *ip_ports);
|
||||
|
||||
non_null()
|
||||
bool bin_pack_ip_port(Bin_Pack *bp, const Logger *logger, const IP_Port *ip_port);
|
||||
|
||||
/** @brief Pack an IP_Port structure into data of max size length.
|
||||
*
|
||||
* Packed_length is the offset of data currently packed.
|
||||
*
|
||||
* @return size of packed IP_Port data on success.
|
||||
* @retval -1 on failure.
|
||||
*/
|
||||
non_null()
|
||||
int pack_ip_port(const Logger *logger, uint8_t *data, uint16_t length, const IP_Port *ip_port);
|
||||
|
||||
/** @brief Unpack IP_Port structure from data of max size length into ip_port.
|
||||
*
|
||||
* len_processed is the offset of data currently unpacked.
|
||||
*
|
||||
* @return size of unpacked ip_port on success.
|
||||
* @retval -1 on failure.
|
||||
*/
|
||||
non_null()
|
||||
int unpack_ip_port(IP_Port *ip_port, const uint8_t *data, uint16_t length, bool tcp_enabled);
|
||||
|
||||
/**
|
||||
* @return true on success, false on failure.
|
||||
*/
|
||||
@ -553,8 +593,8 @@ void net_kill_strerror(char *strerror);
|
||||
*/
|
||||
non_null(1, 2, 3, 4) nullable(7)
|
||||
Networking_Core *new_networking_ex(
|
||||
const Logger *log, const Memory *mem, const Network *ns, const IP *ip,
|
||||
uint16_t port_from, uint16_t port_to, unsigned int *error);
|
||||
const Logger *log, const Memory *mem, const Network *ns, const IP *ip,
|
||||
uint16_t port_from, uint16_t port_to, unsigned int *error);
|
||||
|
||||
non_null()
|
||||
Networking_Core *new_networking_no_udp(const Logger *log, const Memory *mem, const Network *ns);
|
||||
@ -564,7 +604,7 @@ nullable(1)
|
||||
void kill_networking(Networking_Core *net);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif /* C_TOXCORE_TOXCORE_NETWORK_H */
|
||||
|
||||
Reference in New Issue
Block a user