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
@ -11,6 +11,7 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include "tox.h"
|
||||
#include "tox_options.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -92,52 +93,53 @@ uint32_t tox_dht_node_public_key_size(void);
|
||||
* @param ip The node's IP address, represented as a NUL-terminated C string.
|
||||
* @param port The node's port.
|
||||
*/
|
||||
typedef void tox_dht_get_nodes_response_cb(Tox *tox, const uint8_t *public_key, const char *ip, uint16_t port,
|
||||
void *user_data);
|
||||
typedef void tox_dht_nodes_response_cb(
|
||||
Tox *tox, const uint8_t *public_key, const char *ip, uint32_t ip_length,
|
||||
uint16_t port, void *user_data);
|
||||
|
||||
/**
|
||||
* Set the callback for the `dht_get_nodes_response` event. Pass NULL to unset.
|
||||
* Set the callback for the `dht_nodes_response` event. Pass NULL to unset.
|
||||
*
|
||||
* This event is triggered when a getnodes response is received from a DHT peer.
|
||||
* This event is triggered when a nodes response is received from a DHT peer.
|
||||
*/
|
||||
void tox_callback_dht_get_nodes_response(Tox *tox, tox_dht_get_nodes_response_cb *callback);
|
||||
void tox_callback_dht_nodes_response(Tox *tox, tox_dht_nodes_response_cb *callback);
|
||||
|
||||
typedef enum Tox_Err_Dht_Get_Nodes {
|
||||
typedef enum Tox_Err_Dht_Send_Nodes_Request {
|
||||
/**
|
||||
* The function returned successfully.
|
||||
*/
|
||||
TOX_ERR_DHT_GET_NODES_OK,
|
||||
TOX_ERR_DHT_SEND_NODES_REQUEST_OK,
|
||||
|
||||
/**
|
||||
* UDP is disabled in Tox options; the DHT can only be queried when UDP is
|
||||
* enabled.
|
||||
*/
|
||||
TOX_ERR_DHT_GET_NODES_UDP_DISABLED,
|
||||
TOX_ERR_DHT_SEND_NODES_REQUEST_UDP_DISABLED,
|
||||
|
||||
/**
|
||||
* One of the arguments to the function was NULL when it was not expected.
|
||||
*/
|
||||
TOX_ERR_DHT_GET_NODES_NULL,
|
||||
TOX_ERR_DHT_SEND_NODES_REQUEST_NULL,
|
||||
|
||||
/**
|
||||
* The supplied port is invalid.
|
||||
*/
|
||||
TOX_ERR_DHT_GET_NODES_BAD_PORT,
|
||||
TOX_ERR_DHT_SEND_NODES_REQUEST_BAD_PORT,
|
||||
|
||||
/**
|
||||
* The supplied IP address is invalid.
|
||||
*/
|
||||
TOX_ERR_DHT_GET_NODES_BAD_IP,
|
||||
TOX_ERR_DHT_SEND_NODES_REQUEST_BAD_IP,
|
||||
|
||||
/**
|
||||
* The getnodes request failed. This usually means the packet failed to
|
||||
* The nodes request failed. This usually means the packet failed to
|
||||
* send.
|
||||
*/
|
||||
TOX_ERR_DHT_GET_NODES_FAIL,
|
||||
} Tox_Err_Dht_Get_Nodes;
|
||||
TOX_ERR_DHT_SEND_NODES_REQUEST_FAIL,
|
||||
} Tox_Err_Dht_Send_Nodes_Request;
|
||||
|
||||
/**
|
||||
* This function sends a getnodes request to a DHT node for its peers that
|
||||
* This function sends a nodes request to a DHT node for its peers that
|
||||
* are "close" to the passed target public key according to the distance metric
|
||||
* used by the DHT implementation.
|
||||
*
|
||||
@ -151,8 +153,8 @@ typedef enum Tox_Err_Dht_Get_Nodes {
|
||||
*
|
||||
* @return true on success.
|
||||
*/
|
||||
bool tox_dht_get_nodes(const Tox *tox, const uint8_t *public_key, const char *ip, uint16_t port,
|
||||
const uint8_t *target_public_key, Tox_Err_Dht_Get_Nodes *error);
|
||||
bool tox_dht_send_nodes_request(const Tox *tox, const uint8_t *public_key, const char *ip, uint16_t port,
|
||||
const uint8_t *target_public_key, Tox_Err_Dht_Send_Nodes_Request *error);
|
||||
|
||||
/**
|
||||
* This function returns the number of DHT nodes in the closelist.
|
||||
@ -201,7 +203,7 @@ typedef enum Tox_Netprof_Packet_Id {
|
||||
TOX_NETPROF_PACKET_ID_ONE = 0x01,
|
||||
|
||||
/**
|
||||
* Get nodes request packet (UDP).
|
||||
* Nodes request packet (UDP).
|
||||
* Connection notification (TCP).
|
||||
*/
|
||||
TOX_NETPROF_PACKET_ID_TWO = 0x02,
|
||||
@ -212,7 +214,7 @@ typedef enum Tox_Netprof_Packet_Id {
|
||||
TOX_NETPROF_PACKET_ID_TCP_DISCONNECT = 0x03,
|
||||
|
||||
/**
|
||||
* Send nodes response packet (UDP).
|
||||
* Nodes response packet (UDP).
|
||||
* Ping packet (TCP).
|
||||
*/
|
||||
TOX_NETPROF_PACKET_ID_FOUR = 0x04,
|
||||
|
||||
Reference in New Issue
Block a user