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:
@ -113,8 +113,8 @@ Family net_family_tox_tcp_ipv6(void);
|
||||
typedef enum Net_Packet_Type {
|
||||
NET_PACKET_PING_REQUEST = 0x00, /* Ping request packet ID. */
|
||||
NET_PACKET_PING_RESPONSE = 0x01, /* Ping response packet ID. */
|
||||
NET_PACKET_GET_NODES = 0x02, /* Get nodes request packet ID. */
|
||||
NET_PACKET_SEND_NODES_IPV6 = 0x04, /* Send nodes response packet ID for other addresses. */
|
||||
NET_PACKET_NODES_REQUEST = 0x02, /* Nodes request packet ID. */
|
||||
NET_PACKET_NODES_RESPONSE = 0x04, /* Nodes response packet ID. */
|
||||
NET_PACKET_COOKIE_REQUEST = 0x18, /* Cookie request packet */
|
||||
NET_PACKET_COOKIE_RESPONSE = 0x19, /* Cookie response packet */
|
||||
NET_PACKET_CRYPTO_HS = 0x1a, /* Crypto handshake packet */
|
||||
@ -236,12 +236,27 @@ Socket net_invalid_socket(void);
|
||||
|
||||
/**
|
||||
* Calls send(sockfd, buf, len, MSG_NOSIGNAL).
|
||||
*
|
||||
* @param ns System network object.
|
||||
* @param log Logger object.
|
||||
* @param sock Socket to send data with.
|
||||
* @param buf Data to send.
|
||||
* @param len Length of data.
|
||||
* @param ip_port IP and port to send data to.
|
||||
* @param net_profile Network profile to record the packet.
|
||||
*/
|
||||
non_null(1, 2, 4, 6) nullable(7)
|
||||
int net_send(const Network *ns, const Logger *log, Socket sock, const uint8_t *buf, size_t len, const IP_Port *ip_port,
|
||||
Net_Profile *net_profile);
|
||||
/**
|
||||
* Calls recv(sockfd, buf, len, MSG_NOSIGNAL).
|
||||
*
|
||||
* @param ns System network object.
|
||||
* @param log Logger object.
|
||||
* @param sock Socket to receive data with.
|
||||
* @param buf Buffer to store received data.
|
||||
* @param len Length of buffer.
|
||||
* @param ip_port IP and port of the sender.
|
||||
*/
|
||||
non_null()
|
||||
int net_recv(const Network *ns, const Logger *log, Socket sock, uint8_t *buf, size_t len, const IP_Port *ip_port);
|
||||
@ -582,26 +597,32 @@ bool bind_to_port(const Network *ns, Socket sock, Family family, uint16_t port);
|
||||
* Note that different platforms may return different codes for the same error,
|
||||
* so you likely shouldn't be checking the value returned by this function
|
||||
* unless you know what you are doing, you likely just want to use it in
|
||||
* combination with `net_new_strerror()` to print the error.
|
||||
* combination with `net_strerror()` to print the error.
|
||||
*
|
||||
* return platform-dependent network error code, if any.
|
||||
*/
|
||||
int net_error(void);
|
||||
|
||||
#define NET_STRERROR_SIZE 256
|
||||
|
||||
/** @brief Contains a null terminated formatted error message.
|
||||
*
|
||||
* This struct should not contain more than at most the 2 fields.
|
||||
*/
|
||||
typedef struct Net_Strerror {
|
||||
char data[NET_STRERROR_SIZE];
|
||||
uint16_t size;
|
||||
} Net_Strerror;
|
||||
|
||||
/** @brief Get a text explanation for the error code from `net_error()`.
|
||||
*
|
||||
* return NULL on failure.
|
||||
* return pointer to a NULL-terminated string describing the error code on
|
||||
* success. The returned string must be freed using `net_kill_strerror()`.
|
||||
* @param error The error code to get a string for.
|
||||
* @param buf The struct to store the error message in (usually on stack).
|
||||
*
|
||||
* @return pointer to a NULL-terminated string describing the error code.
|
||||
*/
|
||||
char *net_new_strerror(int error);
|
||||
|
||||
/** @brief Frees the string returned by `net_new_strerror()`.
|
||||
* It's valid to pass NULL as the argument, the function does nothing in this
|
||||
* case.
|
||||
*/
|
||||
nullable(1)
|
||||
void net_kill_strerror(char *strerror);
|
||||
non_null()
|
||||
char *net_strerror(int error, Net_Strerror *buf);
|
||||
|
||||
/** @brief Initialize networking.
|
||||
* Bind to ip and port.
|
||||
|
Reference in New Issue
Block a user