forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 1828c5356..c9cdae001
c9cdae001 fix(toxav): remove extra copy of video frame on encode 4f6d4546b test: Improve the fake network library. a2581e700 refactor(toxcore): generate `Friend_Request` and `Dht_Nodes_Response` 2aaa11770 refactor(toxcore): use Tox_Memory in generated events 5c367452b test(toxcore): fix incorrect mutex in tox_scenario_get_time 8f92e710f perf: Add a timed limit of number of cookie requests. 695b6417a test: Add some more simulated network support. 815ae9ce9 test(toxcore): fix thread-safety in scenario framework 6d85c754e test(toxcore): add unit tests for net_crypto 9c22e79cc test(support): add SimulatedEnvironment for deterministic testing f34fcb195 chore: Update windows Dockerfile to debian stable (trixie). ece0e8980 fix(group_moderation): allow validating unsorted sanction list signatures a4fa754d7 refactor: rename struct Packet to struct Net_Packet d6f330f85 cleanup: Fix some warnings from coverity. e206bffa2 fix(group_chats): fix sync packets reverting topics 0e4715598 test: Add new scenario testing framework. 668291f44 refactor(toxcore): decouple Network_Funcs from sockaddr via IP_Port fc4396cef fix: potential division by zero in toxav and unsafe hex parsing 8e8b352ab refactor: Add nullable annotations to struct members. 7740bb421 refactor: decouple net_crypto from DHT 1936d4296 test: add benchmark for toxav audio and video 46bfdc2df fix: correct printf format specifiers for unsigned integers REVERT: 1828c5356 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: c9cdae001341e701fca980c9bb9febfeb95d2902
This commit is contained in:
@@ -51,6 +51,10 @@ typedef enum Friendconn_Status {
|
||||
FRIENDCONN_STATUS_CONNECTED,
|
||||
} Friendconn_Status;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct Friend_Connections Friend_Connections;
|
||||
|
||||
Net_Crypto *_Nonnull friendconn_net_crypto(const Friend_Connections *_Nonnull fr_c);
|
||||
@@ -82,7 +86,7 @@ unsigned int friend_con_connected(const Friend_Connections *_Nonnull fr_c, int f
|
||||
*/
|
||||
int get_friendcon_public_keys(uint8_t *_Nullable real_pk, uint8_t *_Nullable dht_temp_pk, const Friend_Connections *_Nonnull fr_c, int friendcon_id);
|
||||
/** Set temp dht key for connection. */
|
||||
void set_dht_temp_pk(Friend_Connections *_Nonnull fr_c, int friendcon_id, const uint8_t *_Nonnull dht_temp_pk, void *_Nonnull userdata);
|
||||
void set_dht_temp_pk(Friend_Connections *_Nonnull fr_c, int friendcon_id, const uint8_t *_Nonnull dht_temp_pk, void *_Nullable userdata);
|
||||
|
||||
typedef int global_status_cb(void *_Nullable object, int friendcon_id, bool status, void *_Nullable userdata);
|
||||
|
||||
@@ -141,7 +145,7 @@ typedef int fr_request_cb(
|
||||
*
|
||||
* This function will be called every time a friend request packet is received.
|
||||
*/
|
||||
void set_friend_request_callback(Friend_Connections *_Nonnull fr_c, fr_request_cb *_Nonnull fr_request_callback, void *_Nonnull object);
|
||||
void set_friend_request_callback(Friend_Connections *_Nonnull fr_c, fr_request_cb *_Nullable fr_request_callback, void *_Nullable object);
|
||||
|
||||
/** Create new friend_connections instance. */
|
||||
Friend_Connections *_Nullable new_friend_connections(const Logger *_Nonnull logger, const Memory *_Nonnull mem, const Mono_Time *_Nonnull mono_time, const Network *_Nonnull ns,
|
||||
@@ -149,7 +153,7 @@ Friend_Connections *_Nullable new_friend_connections(const Logger *_Nonnull logg
|
||||
bool local_discovery_enabled);
|
||||
|
||||
/** main friend_connections loop. */
|
||||
void do_friend_connections(Friend_Connections *_Nonnull fr_c, void *_Nonnull userdata);
|
||||
void do_friend_connections(Friend_Connections *_Nonnull fr_c, void *_Nullable userdata);
|
||||
|
||||
/** Free everything related with friend_connections. */
|
||||
void kill_friend_connections(Friend_Connections *_Nullable fr_c);
|
||||
@@ -159,4 +163,8 @@ Friend_Conn *_Nullable get_conn(const Friend_Connections *_Nonnull fr_c, int fri
|
||||
int friend_conn_get_onion_friendnum(const Friend_Conn *_Nonnull fc);
|
||||
const IP_Port *_Nullable friend_conn_get_dht_ip_port(const Friend_Conn *_Nonnull fc);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* C_TOXCORE_TOXCORE_FRIEND_CONNECTION_H */
|
||||
|
||||
Reference in New Issue
Block a user