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

update toxcore master, with workarounds

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

4
solanaceae/toxcore/tox_event_interface.hpp
View File

@ -58,7 +58,7 @@ struct ToxEventI {
VIRT_EVENT(Tox_Event_Group_Join_Fail)
VIRT_EVENT(Tox_Event_Group_Moderation)
VIRT_EVENT(Tox_Event_Dht_Get_Nodes_Response);
VIRT_EVENT(Tox_Event_Dht_Nodes_Response)
#undef VIRT_EVENT
};
@ -155,6 +155,8 @@ 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)
return Tox_Event_Type::TOX_EVENT_INVALID;
#undef CASE_E_TYPE

2
solanaceae/toxcore/tox_event_logger.cpp
View File

@ -221,7 +221,7 @@ bool ToxEventLogger::onToxEvent(const Tox_Event_Group_Moderation* e) {
return false;
}
bool ToxEventLogger::onToxEvent(const Tox_Event_Dht_Get_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)
//<< " pub:" << tox_event_dht_get_nodes_response_get_public_key(e)
//<< " ip:" << tox_event_dht_get_nodes_response_get_ip(e)

2
solanaceae/toxcore/tox_event_logger.hpp
View File

@ -57,7 +57,7 @@ struct ToxEventLogger : public ToxEventI {
OVER_EVENT(Tox_Event_Group_Join_Fail)
OVER_EVENT(Tox_Event_Group_Moderation)
OVER_EVENT(Tox_Event_Dht_Get_Nodes_Response)
OVER_EVENT(Tox_Event_Dht_Nodes_Response)
#undef OVER_EVENT

9
solanaceae/toxcore/tox_event_provider_base.cpp
View File

@ -63,7 +63,14 @@ 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);
HANDLE_EVENT(DHT_GET_NODES_RESPONSE, dht_get_nodes_response);
// 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;
#undef HANDLE_EVENT
default: