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

Squashed 'external/toxcore/c-toxcore/' changes from 81b1e4f63..59d3f6674

Browse Source 
59d3f6674 chore(deps): bump golang.org/x/net
9324a974d fix: forgot an enum in the nodes request rename see https://github.com/TokTok/c-toxcore/pull/2860

git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: 59d3f6674f39d3cda6ccc9d0223602d7df90d280
This commit is contained in:
Green Sky
2025-03-13 17:49:09 +01:00
parent 3105cc20ef
commit 72325822b8
6 changed files with 12 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
toxcore/events/dht_nodes_response.c
View File

@ -122,7 +122,7 @@ static bool tox_event_dht_nodes_response_unpack_into(
const Tox_Event_Dht_Nodes_Response *tox_event_get_dht_nodes_response(
const Tox_Event *event)
{
return event->type == TOX_EVENT_DHT_GET_NODES_RESPONSE ? event->data.dht_nodes_response : nullptr;
return event->type == TOX_EVENT_DHT_NODES_RESPONSE ? event->data.dht_nodes_response : nullptr;
}
Tox_Event_Dht_Nodes_Response *tox_event_dht_nodes_response_new(const Memory *mem)
@ -156,7 +156,7 @@ static Tox_Event_Dht_Nodes_Response *tox_events_add_dht_nodes_response(Tox_Event
}
Tox_Event event;
event.type = TOX_EVENT_DHT_GET_NODES_RESPONSE;
event.type = TOX_EVENT_DHT_NODES_RESPONSE;
event.data.dht_nodes_response = dht_nodes_response;
if (!tox_events_add(events, &event)) {

2
toxcore/tox_dispatch.c
View File

@ -601,7 +601,7 @@ static void tox_dispatch_invoke_event(const Tox_Dispatch *dispatch, const Tox_Ev
break;
}
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
case TOX_EVENT_DHT_NODES_RESPONSE: {
if (dispatch->dht_nodes_response_callback != nullptr) {
dispatch->dht_nodes_response_callback(event->data.dht_nodes_response, user_data);
}

16
toxcore/tox_event.c
View File

@ -133,8 +133,8 @@ const char *tox_event_type_to_string(Tox_Event_Type type)
case TOX_EVENT_GROUP_MODERATION:
return "TOX_EVENT_GROUP_MODERATION";
case TOX_EVENT_DHT_GET_NODES_RESPONSE:
return "TOX_EVENT_DHT_GET_NODES_RESPONSE";
case TOX_EVENT_DHT_NODES_RESPONSE:
return "TOX_EVENT_DHT_NODES_RESPONSE";
case TOX_EVENT_INVALID:
return "TOX_EVENT_INVALID";
@ -350,7 +350,7 @@ bool tox_event_construct(Tox_Event *event, Tox_Event_Type type, const Memory *me
break;
}
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
case TOX_EVENT_DHT_NODES_RESPONSE: {
event->data.dht_nodes_response = tox_event_dht_nodes_response_new(mem);
break;
}
@ -565,7 +565,7 @@ void tox_event_destruct(Tox_Event *event, const Memory *mem)
break;
}
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
case TOX_EVENT_DHT_NODES_RESPONSE: {
tox_event_dht_nodes_response_free(event->data.dht_nodes_response, mem);
break;
}
@ -705,7 +705,7 @@ static bool tox_event_data_pack(Tox_Event_Type type, const Tox_Event_Data *data,
case TOX_EVENT_GROUP_MODERATION:
return tox_event_group_moderation_pack(data->group_moderation, bp);
case TOX_EVENT_DHT_GET_NODES_RESPONSE:
case TOX_EVENT_DHT_NODES_RESPONSE:
return tox_event_dht_nodes_response_pack(data->dht_nodes_response, bp);
case TOX_EVENT_INVALID:
@ -923,8 +923,8 @@ static bool tox_event_type_from_int(uint32_t value, Tox_Event_Type *out_enum)
return true;
}
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
*out_enum = TOX_EVENT_DHT_GET_NODES_RESPONSE;
case TOX_EVENT_DHT_NODES_RESPONSE: {
*out_enum = TOX_EVENT_DHT_NODES_RESPONSE;
return true;
}
@ -1069,7 +1069,7 @@ static bool tox_event_data_unpack(Tox_Event_Type type, Tox_Event_Data *data, Bin
case TOX_EVENT_GROUP_MODERATION:
return tox_event_group_moderation_unpack(&data->group_moderation, bu, mem);
case TOX_EVENT_DHT_GET_NODES_RESPONSE:
case TOX_EVENT_DHT_NODES_RESPONSE:
return tox_event_dht_nodes_response_unpack(&data->dht_nodes_response, bu, mem);
case TOX_EVENT_INVALID:

2
toxcore/tox_events.h
View File

@ -410,7 +410,7 @@ typedef enum Tox_Event_Type {
TOX_EVENT_GROUP_JOIN_FAIL = 37,
TOX_EVENT_GROUP_MODERATION = 38,
TOX_EVENT_DHT_GET_NODES_RESPONSE = 39,
TOX_EVENT_DHT_NODES_RESPONSE = 39,
TOX_EVENT_INVALID = 255,
} Tox_Event_Type;