From e0b2d03d1a64e75eff7e9ca17e8bf51628c828f5 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Thu, 13 Mar 2025 17:52:22 +0100 Subject: [PATCH] update toxcore to master again, removing workarounds --- solanaceae/toxcore/tox_event_interface.hpp | 2 +- solanaceae/toxcore/tox_event_logger.cpp | 4 ++-- solanaceae/toxcore/tox_event_provider_base.cpp | 9 +-------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/solanaceae/toxcore/tox_event_interface.hpp b/solanaceae/toxcore/tox_event_interface.hpp index e044e00..9e2a77f 100644 --- a/solanaceae/toxcore/tox_event_interface.hpp +++ b/solanaceae/toxcore/tox_event_interface.hpp @@ -155,7 +155,7 @@ constexpr Tox_Event_Type tox_event_from_string(const std::string_view str) { CASE_E_TYPE(TOX_EVENT_GROUP_JOIN_FAIL) CASE_E_TYPE(TOX_EVENT_GROUP_MODERATION) - CASE_E_TYPE(TOX_EVENT_DHT_GET_NODES_RESPONSE) + CASE_E_TYPE(TOX_EVENT_DHT_NODES_RESPONSE) return Tox_Event_Type::TOX_EVENT_INVALID; diff --git a/solanaceae/toxcore/tox_event_logger.cpp b/solanaceae/toxcore/tox_event_logger.cpp index 6fc8446..5bc448d 100644 --- a/solanaceae/toxcore/tox_event_logger.cpp +++ b/solanaceae/toxcore/tox_event_logger.cpp @@ -222,7 +222,7 @@ bool ToxEventLogger::onToxEvent(const Tox_Event_Group_Moderation* e) { } bool ToxEventLogger::onToxEvent(const Tox_Event_Dht_Nodes_Response* e) { - _out << "TOX_EVENT: " << tox_event_to_string(TOX_EVENT_DHT_GET_NODES_RESPONSE) + _out << "TOX_EVENT: " << tox_event_to_string(TOX_EVENT_DHT_NODES_RESPONSE) //<< " pub:" << tox_event_dht_get_nodes_response_get_public_key(e) //<< " ip:" << tox_event_dht_get_nodes_response_get_ip(e) //<< " prt:" << tox_event_dht_get_nodes_response_get_port(e) @@ -284,7 +284,7 @@ void ToxEventLogger::subscribeAll(void) { .subscribe(TOX_EVENT_GROUP_MODERATION) // too spammy - //.subscribe(TOX_EVENT_DHT_GET_NODES_RESPONSE); + //.subscribe(TOX_EVENT_DHT_NODES_RESPONSE); ; } diff --git a/solanaceae/toxcore/tox_event_provider_base.cpp b/solanaceae/toxcore/tox_event_provider_base.cpp index 5421461..f3890ed 100644 --- a/solanaceae/toxcore/tox_event_provider_base.cpp +++ b/solanaceae/toxcore/tox_event_provider_base.cpp @@ -63,14 +63,7 @@ void ToxEventProviderBase::dispatchEvents(const Tox_Events* events) { HANDLE_EVENT(GROUP_SELF_JOIN, group_self_join); HANDLE_EVENT(GROUP_JOIN_FAIL, group_join_fail); HANDLE_EVENT(GROUP_MODERATION, group_moderation); - // FIXME: get pr merged and update - case Tox_Event_Type::TOX_EVENT_DHT_GET_NODES_RESPONSE: \ - for (auto* tei : _subscribers.at(tox_event_get_type(event))) { \ - if (tei->onToxEvent(tox_event_get_dht_nodes_response(event))) { \ - break; \ - } \ - } \ - break; + HANDLE_EVENT(DHT_NODES_RESPONSE, dht_nodes_response); #undef HANDLE_EVENT default: