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

fix peers we disconnect not being handled

Browse Source
This commit is contained in:
Green Sky 2025-01-18 17:34:22 +01:00
parent d91ad4bfa9
commit dd7eb2702f
No known key found for this signature in database
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
solanaceae/tox_contacts/tox_contact_model2.cpp
View File

@ -747,22 +747,30 @@ bool ToxContactModel2::onToxEvent(const Tox_Event_Group_Peer_Exit* e) {
// we dont care about the part messae? // we dont care about the part messae?
if (exit_type == Tox_Group_Exit_Type::TOX_GROUP_EXIT_TYPE_SELF_DISCONNECTED) { if (exit_type == Tox_Group_Exit_Type::TOX_GROUP_EXIT_TYPE_SELF_DISCONNECTED) {
// you disconnected intentionally, or you where kicked std::cout << "TCM: ngc self exit intentionally/rejoin/kicked\n";
// you disconnected/reconnected intentionally, or you where kicked
// TODO: we need to remove all ToxGroupPeerEphemeral components of that group // TODO: we need to remove all ToxGroupPeerEphemeral components of that group
} else { // do we? there is an event for every peer except ourselfs
auto c = getContactGroupPeer(group_number, peer_number);
if (!static_cast<bool>(c)) {
return false; // we dont track this contact ?????
}
c.emplace_or_replace<Contact::Components::ConnectionState>(Contact::Components::ConnectionState::State::disconnected);
c.remove<Contact::Components::ToxGroupPeerEphemeral>();
// they where kicked
// exit_type == Tox_Group_Exit_Type::TOX_GROUP_EXIT_TYPE_KICK
} }
auto c = getContactGroupPeer(group_number, peer_number);
if (!static_cast<bool>(c)) {
std::cerr << "TCM warning: not tracking ngc peer?\n";
return false; // we dont track this contact ?????
}
c.emplace_or_replace<Contact::Components::ConnectionState>(Contact::Components::ConnectionState::State::disconnected);
c.remove<Contact::Components::ToxGroupPeerEphemeral>();
// TODO: produce system message with reason?
// peer was kicked
// exit_type == Tox_Group_Exit_Type::TOX_GROUP_EXIT_TYPE_KICK
// peer was bad
// exit_type == Tox_Group_Exit_Type::TOX_GROUP_EXIT_TYPE_SYNC_ERROR
return false; return false;
} }