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:
@@ -18,54 +18,54 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
struct Tox {
|
||||
struct Messenger *m;
|
||||
Mono_Time *mono_time;
|
||||
struct Messenger *_Nonnull m;
|
||||
Mono_Time *_Nonnull mono_time;
|
||||
Tox_System sys;
|
||||
pthread_mutex_t *mutex;
|
||||
pthread_mutex_t *_Nullable mutex;
|
||||
|
||||
tox_log_cb *log_callback;
|
||||
tox_self_connection_status_cb *self_connection_status_callback;
|
||||
tox_friend_name_cb *friend_name_callback;
|
||||
tox_friend_status_message_cb *friend_status_message_callback;
|
||||
tox_friend_status_cb *friend_status_callback;
|
||||
tox_friend_connection_status_cb *friend_connection_status_callback;
|
||||
tox_friend_typing_cb *friend_typing_callback;
|
||||
tox_friend_read_receipt_cb *friend_read_receipt_callback;
|
||||
tox_friend_request_cb *friend_request_callback;
|
||||
tox_friend_message_cb *friend_message_callback;
|
||||
tox_file_recv_control_cb *file_recv_control_callback;
|
||||
tox_file_chunk_request_cb *file_chunk_request_callback;
|
||||
tox_file_recv_cb *file_recv_callback;
|
||||
tox_file_recv_chunk_cb *file_recv_chunk_callback;
|
||||
tox_conference_invite_cb *conference_invite_callback;
|
||||
tox_conference_connected_cb *conference_connected_callback;
|
||||
tox_conference_message_cb *conference_message_callback;
|
||||
tox_conference_title_cb *conference_title_callback;
|
||||
tox_conference_peer_name_cb *conference_peer_name_callback;
|
||||
tox_conference_peer_list_changed_cb *conference_peer_list_changed_callback;
|
||||
tox_dht_nodes_response_cb *dht_nodes_response_callback;
|
||||
tox_friend_lossy_packet_cb *friend_lossy_packet_callback_per_pktid[UINT8_MAX + 1];
|
||||
tox_friend_lossless_packet_cb *friend_lossless_packet_callback_per_pktid[UINT8_MAX + 1];
|
||||
tox_group_peer_name_cb *group_peer_name_callback;
|
||||
tox_group_peer_status_cb *group_peer_status_callback;
|
||||
tox_group_topic_cb *group_topic_callback;
|
||||
tox_group_privacy_state_cb *group_privacy_state_callback;
|
||||
tox_group_topic_lock_cb *group_topic_lock_callback;
|
||||
tox_group_voice_state_cb *group_voice_state_callback;
|
||||
tox_group_peer_limit_cb *group_peer_limit_callback;
|
||||
tox_group_password_cb *group_password_callback;
|
||||
tox_group_message_cb *group_message_callback;
|
||||
tox_group_private_message_cb *group_private_message_callback;
|
||||
tox_group_custom_packet_cb *group_custom_packet_callback;
|
||||
tox_group_custom_private_packet_cb *group_custom_private_packet_callback;
|
||||
tox_group_invite_cb *group_invite_callback;
|
||||
tox_group_peer_join_cb *group_peer_join_callback;
|
||||
tox_group_peer_exit_cb *group_peer_exit_callback;
|
||||
tox_group_self_join_cb *group_self_join_callback;
|
||||
tox_group_join_fail_cb *group_join_fail_callback;
|
||||
tox_group_moderation_cb *group_moderation_callback;
|
||||
tox_log_cb *_Nullable log_callback;
|
||||
tox_self_connection_status_cb *_Nullable self_connection_status_callback;
|
||||
tox_friend_name_cb *_Nullable friend_name_callback;
|
||||
tox_friend_status_message_cb *_Nullable friend_status_message_callback;
|
||||
tox_friend_status_cb *_Nullable friend_status_callback;
|
||||
tox_friend_connection_status_cb *_Nullable friend_connection_status_callback;
|
||||
tox_friend_typing_cb *_Nullable friend_typing_callback;
|
||||
tox_friend_read_receipt_cb *_Nullable friend_read_receipt_callback;
|
||||
tox_friend_request_cb *_Nullable friend_request_callback;
|
||||
tox_friend_message_cb *_Nullable friend_message_callback;
|
||||
tox_file_recv_control_cb *_Nullable file_recv_control_callback;
|
||||
tox_file_chunk_request_cb *_Nullable file_chunk_request_callback;
|
||||
tox_file_recv_cb *_Nullable file_recv_callback;
|
||||
tox_file_recv_chunk_cb *_Nullable file_recv_chunk_callback;
|
||||
tox_conference_invite_cb *_Nullable conference_invite_callback;
|
||||
tox_conference_connected_cb *_Nullable conference_connected_callback;
|
||||
tox_conference_message_cb *_Nullable conference_message_callback;
|
||||
tox_conference_title_cb *_Nullable conference_title_callback;
|
||||
tox_conference_peer_name_cb *_Nullable conference_peer_name_callback;
|
||||
tox_conference_peer_list_changed_cb *_Nullable conference_peer_list_changed_callback;
|
||||
tox_dht_nodes_response_cb *_Nullable dht_nodes_response_callback;
|
||||
tox_friend_lossy_packet_cb *_Nullable friend_lossy_packet_callback_per_pktid[UINT8_MAX + 1];
|
||||
tox_friend_lossless_packet_cb *_Nullable friend_lossless_packet_callback_per_pktid[UINT8_MAX + 1];
|
||||
tox_group_peer_name_cb *_Nullable group_peer_name_callback;
|
||||
tox_group_peer_status_cb *_Nullable group_peer_status_callback;
|
||||
tox_group_topic_cb *_Nullable group_topic_callback;
|
||||
tox_group_privacy_state_cb *_Nullable group_privacy_state_callback;
|
||||
tox_group_topic_lock_cb *_Nullable group_topic_lock_callback;
|
||||
tox_group_voice_state_cb *_Nullable group_voice_state_callback;
|
||||
tox_group_peer_limit_cb *_Nullable group_peer_limit_callback;
|
||||
tox_group_password_cb *_Nullable group_password_callback;
|
||||
tox_group_message_cb *_Nullable group_message_callback;
|
||||
tox_group_private_message_cb *_Nullable group_private_message_callback;
|
||||
tox_group_custom_packet_cb *_Nullable group_custom_packet_callback;
|
||||
tox_group_custom_private_packet_cb *_Nullable group_custom_private_packet_callback;
|
||||
tox_group_invite_cb *_Nullable group_invite_callback;
|
||||
tox_group_peer_join_cb *_Nullable group_peer_join_callback;
|
||||
tox_group_peer_exit_cb *_Nullable group_peer_exit_callback;
|
||||
tox_group_self_join_cb *_Nullable group_self_join_callback;
|
||||
tox_group_join_fail_cb *_Nullable group_join_fail_callback;
|
||||
tox_group_moderation_cb *_Nullable group_moderation_callback;
|
||||
|
||||
void *toxav_object; // workaround to store a ToxAV object (setter and getter functions are available)
|
||||
void *_Nullable toxav_object; // workaround to store a ToxAV object (setter and getter functions are available)
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
Reference in New Issue
Block a user