Green-Sky/solanaceae_toxcore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update toxcore to master again, removing workarounds

Browse Source
This commit is contained in:
Green Sky 2025-03-13 17:52:22 +01:00
parent 9b735e3a2e
commit e0b2d03d1a
No known key found for this signature in database
GPG Key ID: DBE05085D874AB4A
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solanaceae/toxcore/tox_event_interface.hpp
View File

@ -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_JOIN_FAIL)
CASE_E_TYPE(TOX_EVENT_GROUP_MODERATION) 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; return Tox_Event_Type::TOX_EVENT_INVALID;

4
solanaceae/toxcore/tox_event_logger.cpp
View File

@ -222,7 +222,7 @@ bool ToxEventLogger::onToxEvent(const Tox_Event_Group_Moderation* e) {
} }
bool ToxEventLogger::onToxEvent(const Tox_Event_Dht_Nodes_Response* 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) //<< " pub:" << tox_event_dht_get_nodes_response_get_public_key(e)
//<< " ip:" << tox_event_dht_get_nodes_response_get_ip(e) //<< " ip:" << tox_event_dht_get_nodes_response_get_ip(e)
//<< " prt:" << tox_event_dht_get_nodes_response_get_port(e) //<< " prt:" << tox_event_dht_get_nodes_response_get_port(e)
@ -284,7 +284,7 @@ void ToxEventLogger::subscribeAll(void) {
.subscribe(TOX_EVENT_GROUP_MODERATION) .subscribe(TOX_EVENT_GROUP_MODERATION)
// too spammy // too spammy
//.subscribe(TOX_EVENT_DHT_GET_NODES_RESPONSE); //.subscribe(TOX_EVENT_DHT_NODES_RESPONSE);
; ;
} }

9
solanaceae/toxcore/tox_event_provider_base.cpp
View File

@ -63,14 +63,7 @@ void ToxEventProviderBase::dispatchEvents(const Tox_Events* events) {
HANDLE_EVENT(GROUP_SELF_JOIN, group_self_join); HANDLE_EVENT(GROUP_SELF_JOIN, group_self_join);
HANDLE_EVENT(GROUP_JOIN_FAIL, group_join_fail); HANDLE_EVENT(GROUP_JOIN_FAIL, group_join_fail);
HANDLE_EVENT(GROUP_MODERATION, group_moderation); HANDLE_EVENT(GROUP_MODERATION, group_moderation);
// FIXME: get pr merged and update HANDLE_EVENT(DHT_NODES_RESPONSE, dht_nodes_response);
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;
#undef HANDLE_EVENT #undef HANDLE_EVENT
default: default: