Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-22 16:26:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

do not delete handshake messages maybe belonging to secure-joins on other devices

Browse Source
This commit is contained in:
B. Petersen
2020-01-24 12:50:26 +01:00
parent 8817cf5116
commit c54e211147
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/securejoin.rs
View File

@@ -626,8 +626,9 @@ pub(crate) fn handle_securejoin_handshake(
let ret = if join_vg { let ret = if join_vg {
HandshakeMessage::Propagate HandshakeMessage::Propagate
} else { } else {
HandshakeMessage::Done HandshakeMessage::Ignore
}; };
if context.bob.read().unwrap().expects != DC_VC_CONTACT_CONFIRM { if context.bob.read().unwrap().expects != DC_VC_CONTACT_CONFIRM {
info!(context, "Message belongs to a different handshake.",); info!(context, "Message belongs to a different handshake.",);
return Ok(ret); return Ok(ret);
@@ -713,7 +714,11 @@ pub(crate) fn handle_securejoin_handshake(
} }
context.bob.write().unwrap().status = 1; context.bob.write().unwrap().status = 1;
context.stop_ongoing(); context.stop_ongoing();
Ok(ret) Ok(if join_vg {
HandshakeMessage::Propagate
} else {
HandshakeMessage::Done
})
} }
"vg-member-added-received" => { "vg-member-added-received" => {
/*========================================================== /*==========================================================