Squashed 'external/toxcore/c-toxcore/' changes from c9cdae001..9ed2fa80d
9ed2fa80d fix(toxav): remove extra copy of video frame on encode de30cf3ad docs: Add new file kinds, that should be useful to all clients. d5b5e879d fix(DHT): Correct node skipping logic timed out nodes. 30e71fe97 refactor: Generate event dispatch functions and add tox_events_dispatch. 8fdbb0b50 style: Format parameter lists in event handlers. d00dee12b refactor: Add warning logs when losing chat invites. b144e8db1 feat: Add a way to look up a file number by ID. 849281ea0 feat: Add a way to fetch groups by chat ID. a2c177396 refactor: Harden event system and improve type safety. 8f5caa656 refactor: Add MessagePack string support to bin_pack. 34e8d5ad5 chore: Add GitHub CodeQL workflow and local Docker runner. f7b068010 refactor: Add nullability annotations to event headers. 788abe651 refactor(toxav): Use system allocator for mutexes. 2e4b423eb refactor: Use specific typedefs for public API arrays. 2baf34775 docs(toxav): update idle iteration interval see 679444751876fa3882a717772918ebdc8f083354 2f87ac67b feat: Add Event Loop abstraction (Ev). f8dfc38d8 test: Fix data race in ToxScenario virtual_clock. 38313921e test(TCP): Add regression test for TCP priority queue integrity. f94a50d9a refactor(toxav): Replace mutable_mutex with dynamically allocated mutex. ad054511e refactor: Internalize DHT structs and add debug helpers. 8b467cc96 fix: Prevent potential integer overflow in group chat handshake. 4962bdbb8 test: Improve TCP simulation and add tests 5f0227093 refactor: Allow nullable data in group chat handlers. e97b18ea9 chore: Improve Windows Docker support. b14943bbd refactor: Move Logger out of Messenger into Tox. dd3136250 cleanup: Apply nullability qualifiers to C++ codebase. 1849f70fc refactor: Extract low-level networking code to net and os_network. 8fec75421 refactor: Delete tox_random, align on rng and os_random. a03ae8051 refactor: Delete tox_memory, align on mem and os_memory. 4c88fed2c refactor: Use `std::` prefixes more consistently in C++ code. 72452f2ae test: Add some more tests for onion and shared key cache. d5a51b09a cleanup: Use tox_attributes.h in tox_private.h and install it. b6f5b9fc5 test: Add some benchmarks for various high level things. 8a8d02785 test(support): Introduce threaded Tox runner and simulation barrier d68d1d095 perf(toxav): optimize audio and video intermediate buffers by keeping them around REVERT: c9cdae001 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 9ed2fa80d582c714d6bdde6a7648220a92cddff8
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
#include "../tox_event.h"
|
||||
#include "../tox_events.h"
|
||||
#include "../tox_pack.h"
|
||||
#include "../tox_struct.h"
|
||||
#include "../tox_unpack.h"
|
||||
|
||||
/*****************************************************
|
||||
@@ -27,7 +28,7 @@
|
||||
struct Tox_Event_Conference_Invite {
|
||||
uint32_t friend_number;
|
||||
Tox_Conference_Type type;
|
||||
uint8_t *cookie;
|
||||
uint8_t *_Nullable cookie;
|
||||
uint32_t cookie_length;
|
||||
};
|
||||
|
||||
@@ -68,6 +69,12 @@ static bool tox_event_conference_invite_set_cookie(Tox_Event_Conference_Invite *
|
||||
return true;
|
||||
}
|
||||
|
||||
if (cookie_length == 0) {
|
||||
conference_invite->cookie = nullptr;
|
||||
conference_invite->cookie_length = 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
uint8_t *cookie_copy = (uint8_t *)mem_balloc(mem, cookie_length);
|
||||
|
||||
if (cookie_copy == nullptr) {
|
||||
@@ -149,7 +156,7 @@ Tox_Event_Conference_Invite *tox_event_conference_invite_new(const Memory *mem)
|
||||
void tox_event_conference_invite_free(Tox_Event_Conference_Invite *conference_invite, const Memory *mem)
|
||||
{
|
||||
if (conference_invite != nullptr) {
|
||||
tox_event_conference_invite_destruct((Tox_Event_Conference_Invite * _Nonnull)conference_invite, mem);
|
||||
tox_event_conference_invite_destruct(conference_invite, mem);
|
||||
}
|
||||
mem_delete(mem, conference_invite);
|
||||
}
|
||||
@@ -210,7 +217,10 @@ static Tox_Event_Conference_Invite *tox_event_conference_invite_alloc(Tox_Events
|
||||
*****************************************************/
|
||||
|
||||
void tox_events_handle_conference_invite(
|
||||
Tox *tox, uint32_t friend_number, Tox_Conference_Type type, const uint8_t *cookie, size_t length,
|
||||
Tox *tox,
|
||||
uint32_t friend_number,
|
||||
Tox_Conference_Type type,
|
||||
const uint8_t *cookie, size_t length,
|
||||
void *user_data)
|
||||
{
|
||||
Tox_Events_State *state = tox_events_alloc(user_data);
|
||||
@@ -222,5 +232,18 @@ void tox_events_handle_conference_invite(
|
||||
|
||||
tox_event_conference_invite_set_friend_number(conference_invite, friend_number);
|
||||
tox_event_conference_invite_set_type(conference_invite, type);
|
||||
tox_event_conference_invite_set_cookie(conference_invite, state->mem, cookie, length);
|
||||
if (!tox_event_conference_invite_set_cookie(conference_invite, state->mem, cookie, length)) {
|
||||
state->error = TOX_ERR_EVENTS_ITERATE_MALLOC;
|
||||
}
|
||||
}
|
||||
|
||||
void tox_events_handle_conference_invite_dispatch(Tox *tox, const Tox_Event_Conference_Invite *event, void *user_data)
|
||||
{
|
||||
if (tox->conference_invite_callback == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
tox_unlock(tox);
|
||||
tox->conference_invite_callback(tox, event->friend_number, event->type, event->cookie, event->cookie_length, user_data);
|
||||
tox_lock(tox);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user