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

gracefully handle toxcore forgetting early

Browse Source
This commit is contained in:
Green Sky 2023-10-06 12:50:53 +02:00
parent f12e609c21
commit 0e6556cd86
No known key found for this signature in database
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solanaceae/tox_messages/tox_transfer_manager.cpp
View File

@ -403,6 +403,15 @@ bool ToxTransferManager::onToxEvent(const Tox_Event_File_Recv* e) {
// TODO: also check for file id // TODO: also check for file id
auto [f_id_opt, _] = _t.toxFileGetFileID(friend_number, file_number);
//assert(f_id_opt.has_value());
if (!f_id_opt.has_value()) {
// very unfortuante, toxcore already forgot about the transfer we are handling
// TODO: make sure we exit cracefully here
std::cerr << "TTM error: querying for fileid failed, toxcore already forgot. frd:" << friend_number << " fnb:" << file_number << "\n";
return false;
}
// get current time unix epoch utc // get current time unix epoch utc
uint64_t ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(); uint64_t ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
@ -421,8 +430,6 @@ bool ToxTransferManager::onToxEvent(const Tox_Event_File_Recv* e) {
transfer.emplace<Message::Components::Transfer::ToxTransferFriend>(friend_number, file_number); transfer.emplace<Message::Components::Transfer::ToxTransferFriend>(friend_number, file_number);
transfer.emplace<Message::Components::Transfer::FileKind>(file_kind); transfer.emplace<Message::Components::Transfer::FileKind>(file_kind);
auto [f_id_opt, _] = _t.toxFileGetFileID(friend_number, file_number);
assert(f_id_opt.has_value());
transfer.emplace<Message::Components::Transfer::FileID>(f_id_opt.value()); transfer.emplace<Message::Components::Transfer::FileID>(f_id_opt.value());
{ // file info { // file info