all other events

CMakeLists.txt

@@ -250,9 +250,29 @@ set(toxcore_API_HEADERS ${toxcore_API_HEADERS} ${toxcore_SOURCE_DIR}/toxcore/tox
 # LAYER 9: New async events API
 # -------------------
 set(toxcore_SOURCES ${toxcore_SOURCES}
+  toxcore/events/conference_connected.c
+  toxcore/events/conference_invite.c
+  toxcore/events/conference_message.c
+  toxcore/events/conference_peer_list_changed.c
+  toxcore/events/conference_peer_name.c
+  toxcore/events/conference_title.c
+  toxcore/events/file_chunk_request.c
+  toxcore/events/file_recv.c
+  toxcore/events/file_recv_chunk.c
+  toxcore/events/file_recv_control.c
+  toxcore/events/friend_connection_status.c
+  toxcore/events/friend_lossless_packet.c
+  toxcore/events/friend_lossy_packet.c
   toxcore/events/friend_message.c
+  toxcore/events/friend_name.c
+  toxcore/events/friend_read_receipt.c
+  toxcore/events/friend_request.c
+  toxcore/events/friend_status.c
+  toxcore/events/friend_status_message.c
+  toxcore/events/friend_typing.c
   toxcore/events/internal.c
   toxcore/events/internal.h
+  toxcore/events/self_connection_status.c
   toxcore/tox_events.c
   toxcore/tox_events.h)
 set(toxcore_API_HEADERS ${toxcore_API_HEADERS} ${toxcore_SOURCE_DIR}/toxcore/tox_events.h^tox)
@@ -572,4 +592,3 @@ if (BUILD_FUZZ_TESTS)
   add_executable(bootstrap_fuzzer testing/fuzzing/bootstrap_harness.cc)
   target_link_libraries(bootstrap_fuzzer toxcore_static fuzz_adapter -fsanitize=fuzzer)
 endif()
-

auto_tests/tox_events_test.c

@@ -20,7 +20,7 @@ static bool await_message(Tox **toxes)
         Tox_Events *events = tox_events_iterate(toxes[1], nullptr);
 
         if (events != nullptr) {
-            ck_assert(tox_events_get_friend_messages_size(events) == 1);
+            ck_assert(tox_events_get_friend_message_size(events) == 1);
             const Tox_Event_Friend_Message *msg_event = tox_events_get_friend_message(events, 0);
             ck_assert(tox_event_friend_message_get_message_length(msg_event) == sizeof("hello"));
             const uint8_t *msg = tox_event_friend_message_get_message(msg_event);

toxcore/Makefile.inc

@@ -6,9 +6,30 @@ libtoxcore_la_include_HEADERS = \
 libtoxcore_la_includedir = $(includedir)/tox
 
 libtoxcore_la_SOURCES = ../toxcore/ccompat.h \
-                        ../toxcore/events/internal.h \
-                        ../toxcore/events/internal.c \
+                        ../toxcore/events/conference_connected.c \
+                        ../toxcore/events/conference_invite.c \
+                        ../toxcore/events/conference_message.c \
+                        ../toxcore/events/conference_peer_list_changed.c \
+                        ../toxcore/events/conference_peer_name.c \
+                        ../toxcore/events/conference_title.c \
+                        ../toxcore/events/file_chunk_request.c \
+                        ../toxcore/events/file_recv.c \
+                        ../toxcore/events/file_recv_chunk.c \
+                        ../toxcore/events/file_recv_control.c \
+                        ../toxcore/events/friend_connection_status.c \
+                        ../toxcore/events/friend_lossless_packet.c \
+                        ../toxcore/events/friend_lossy_packet.c \
+                        ../toxcore/events/friend_message.c \
                         ../toxcore/events/friend_message.c \
+                        ../toxcore/events/friend_name.c \
+                        ../toxcore/events/friend_read_receipt.c \
+                        ../toxcore/events/friend_request.c \
+                        ../toxcore/events/friend_status.c \
+                        ../toxcore/events/friend_status_message.c \
+                        ../toxcore/events/friend_typing.c \
+                        ../toxcore/events/internal.c \
+                        ../toxcore/events/internal.h \
+                        ../toxcore/events/self_connection_status.c \
                         ../toxcore/DHT.h \
                         ../toxcore/DHT.c \
                         ../toxcore/mono_time.h \

toxcore/events/conference_connected.c

@@ -0,0 +1,131 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * Copyright © 2022 The TokTok team.
+ */
+
+#include "internal.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../ccompat.h"
+#include "../tox.h"
+#include "../tox_events.h"
+
+
+/*****************************************************
+ *
+ * :: struct and accessors
+ *
+ *****************************************************/
+
+
+struct Tox_Event_Conference_Connected {
+    uint32_t conference_number;
+};
+
+static void tox_event_conference_connected_construct(Tox_Event_Conference_Connected *conference_connected)
+{
+    *conference_connected = (Tox_Event_Conference_Connected) {
+        0
+    };
+}
+static void tox_event_conference_connected_destruct(Tox_Event_Conference_Connected *conference_connected)
+{
+}
+
+static void tox_event_conference_connected_set_conference_number(Tox_Event_Conference_Connected *conference_connected,
+        uint32_t conference_number)
+{
+    assert(conference_connected != nullptr);
+    conference_connected->conference_number = conference_number;
+}
+uint32_t tox_event_conference_connected_get_conference_number(const Tox_Event_Conference_Connected *conference_connected)
+{
+    assert(conference_connected != nullptr);
+    return conference_connected->conference_number;
+}
+
+
+/*****************************************************
+ *
+ * :: add/clear/get
+ *
+ *****************************************************/
+
+
+static Tox_Event_Conference_Connected *tox_events_add_conference_connected(Tox_Events *events)
+{
+    if (events->conference_connected_size == UINT32_MAX) {
+        return nullptr;
+    }
+
+    if (events->conference_connected_size == events->conference_connected_capacity) {
+        const uint32_t new_conference_connected_capacity = events->conference_connected_capacity * 2 + 1;
+        Tox_Event_Conference_Connected *new_conference_connected = (Tox_Event_Conference_Connected *)realloc(
+                    events->conference_connected, new_conference_connected_capacity * sizeof(Tox_Event_Conference_Connected));
+
+        if (new_conference_connected == nullptr) {
+            return nullptr;
+        }
+
+        events->conference_connected = new_conference_connected;
+        events->conference_connected_capacity = new_conference_connected_capacity;
+    }
+
+    Tox_Event_Conference_Connected *const conference_connected = &events->conference_connected[events->conference_connected_size];
+    tox_event_conference_connected_construct(conference_connected);
+    ++events->conference_connected_size;
+    return conference_connected;
+}
+
+void tox_events_clear_conference_connected(Tox_Events *events)
+{
+    if (events == nullptr) {
+        return;
+    }
+
+    for (uint32_t i = 0; i < events->conference_connected_size; ++i) {
+        tox_event_conference_connected_destruct(&events->conference_connected[i]);
+    }
+
+    free(events->conference_connected);
+    events->conference_connected = nullptr;
+    events->conference_connected_size = 0;
+    events->conference_connected_capacity = 0;
+}
+
+uint32_t tox_events_get_conference_connected_size(const Tox_Events *events)
+{
+    return events->conference_connected_size;
+}
+
+const Tox_Event_Conference_Connected *tox_events_get_conference_connected(const Tox_Events *events, uint32_t index)
+{
+    assert(index < events->conference_connected_size);
+    assert(events->conference_connected != nullptr);
+    return &events->conference_connected[index];
+}
+
+
+/*****************************************************
+ *
+ * :: event handler
+ *
+ *****************************************************/
+
+
+void tox_events_handle_conference_connected(Tox *tox, uint32_t conference_number, void *user_data)
+{
+    Tox_Events_State *state = tox_events_alloc(user_data);
+    assert(state != nullptr);
+
+    Tox_Event_Conference_Connected *conference_connected = tox_events_add_conference_connected(state->events);
+
+    if (conference_connected == nullptr) {
+        state->error = TOX_ERR_EVENTS_ITERATE_MALLOC;
+        return;
+    }
+
+    tox_event_conference_connected_set_conference_number(conference_connected, conference_number);
+}

toxcore/events/conference_invite.c

@@ -0,0 +1,180 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * Copyright © 2022 The TokTok team.
+ */
+
+#include "internal.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../ccompat.h"
+#include "../tox.h"
+#include "../tox_events.h"
+
+
+/*****************************************************
+ *
+ * :: struct and accessors
+ *
+ *****************************************************/
+
+
+struct Tox_Event_Conference_Invite {
+    uint32_t friend_number;
+    Tox_Conference_Type type;
+    uint8_t *cookie;
+    size_t cookie_length;
+};
+
+static void tox_event_conference_invite_construct(Tox_Event_Conference_Invite *conference_invite)
+{
+    *conference_invite = (Tox_Event_Conference_Invite) {
+        0
+    };
+}
+static void tox_event_conference_invite_destruct(Tox_Event_Conference_Invite *conference_invite)
+{
+    free(conference_invite->cookie);
+}
+
+static void tox_event_conference_invite_set_friend_number(Tox_Event_Conference_Invite *conference_invite,
+        uint32_t friend_number)
+{
+    assert(conference_invite != nullptr);
+    conference_invite->friend_number = friend_number;
+}
+uint32_t tox_event_conference_invite_get_friend_number(const Tox_Event_Conference_Invite *conference_invite)
+{
+    assert(conference_invite != nullptr);
+    return conference_invite->friend_number;
+}
+
+static void tox_event_conference_invite_set_type(Tox_Event_Conference_Invite *conference_invite, Tox_Conference_Type type)
+{
+    assert(conference_invite != nullptr);
+    conference_invite->type = type;
+}
+Tox_Conference_Type tox_event_conference_invite_get_type(const Tox_Event_Conference_Invite *conference_invite)
+{
+    assert(conference_invite != nullptr);
+    return conference_invite->type;
+}
+
+static bool tox_event_conference_invite_set_cookie(Tox_Event_Conference_Invite *conference_invite, const uint8_t *cookie,
+        size_t cookie_length)
+{
+    assert(conference_invite != nullptr);
+
+    if (conference_invite->cookie != nullptr) {
+        free(conference_invite->cookie);
+        conference_invite->cookie = nullptr;
+        conference_invite->cookie_length = 0;
+    }
+
+    conference_invite->cookie = (uint8_t *)malloc(cookie_length);
+
+    if (conference_invite->cookie == nullptr) {
+        return false;
+    }
+
+    memcpy(conference_invite->cookie, cookie, cookie_length);
+    conference_invite->cookie_length = cookie_length;
+    return true;
+}
+size_t tox_event_conference_invite_get_cookie_length(const Tox_Event_Conference_Invite *conference_invite)
+{
+    assert(conference_invite != nullptr);
+    return conference_invite->cookie_length;
+}
+const uint8_t *tox_event_conference_invite_get_cookie(const Tox_Event_Conference_Invite *conference_invite)
+{
+    assert(conference_invite != nullptr);
+    return conference_invite->cookie;
+}
+
+
+/*****************************************************
+ *
+ * :: add/clear/get
+ *
+ *****************************************************/
+
+
+static Tox_Event_Conference_Invite *tox_events_add_conference_invite(Tox_Events *events)
+{
+    if (events->conference_invite_size == UINT32_MAX) {
+        return nullptr;
+    }
+
+    if (events->conference_invite_size == events->conference_invite_capacity) {
+        const uint32_t new_conference_invite_capacity = events->conference_invite_capacity * 2 + 1;
+        Tox_Event_Conference_Invite *new_conference_invite = (Tox_Event_Conference_Invite *)realloc(
+                    events->conference_invite, new_conference_invite_capacity * sizeof(Tox_Event_Conference_Invite));
+
+        if (new_conference_invite == nullptr) {
+            return nullptr;
+        }
+
+        events->conference_invite = new_conference_invite;
+        events->conference_invite_capacity = new_conference_invite_capacity;
+    }
+
+    Tox_Event_Conference_Invite *const conference_invite = &events->conference_invite[events->conference_invite_size];
+    tox_event_conference_invite_construct(conference_invite);
+    ++events->conference_invite_size;
+    return conference_invite;
+}
+
+void tox_events_clear_conference_invite(Tox_Events *events)
+{
+    if (events == nullptr) {
+        return;
+    }
+
+    for (uint32_t i = 0; i < events->conference_invite_size; ++i) {
+        tox_event_conference_invite_destruct(&events->conference_invite[i]);
+    }
+
+    free(events->conference_invite);
+    events->conference_invite = nullptr;
+    events->conference_invite_size = 0;
+    events->conference_invite_capacity = 0;
+}
+
+uint32_t tox_events_get_conference_invite_size(const Tox_Events *events)
+{
+    return events->conference_invite_size;
+}
+
+const Tox_Event_Conference_Invite *tox_events_get_conference_invite(const Tox_Events *events, uint32_t index)
+{
+    assert(index < events->conference_invite_size);
+    assert(events->conference_invite != nullptr);
+    return &events->conference_invite[index];
+}
+
+
+/*****************************************************
+ *
+ * :: event handler
+ *
+ *****************************************************/
+
+
+void tox_events_handle_conference_invite(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);
+    assert(state != nullptr);
+
+    Tox_Event_Conference_Invite *conference_invite = tox_events_add_conference_invite(state->events);
+
+    if (conference_invite == nullptr) {
+        state->error = TOX_ERR_EVENTS_ITERATE_MALLOC;
+        return;
+    }
+
+    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, cookie, length);
+}