TudbuT/revpfw3
1
0
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity Actions

fix id syncing

Browse source
This commit is contained in:
Daniella / Tove 2023-10-04 17:33:19 +02:00
parent 0d197f885b
commit bbf2f6e405
Signed by: TudbuT
GPG key ID: 7D63D5634B7C417F
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/client.rs
View file

@ -76,12 +76,14 @@ fn connect(params: &ClientParams) -> Connection {
) )
} }
fn resync(tcp: &mut SocketAdapter) { fn resync(tcp: &mut SocketAdapter, id: &mut u64) {
let mut buf8 = [0u8; 8];
println!(); println!();
eprintln!("Server version mismatch or broken connection. Re-syncing in case of the latter..."); eprintln!("Server version mismatch or broken connection. Re-syncing in case of the latter...");
tcp.internal.set_print(false); tcp.internal.set_print(false);
tcp.write_now().unwrap(); tcp.write_now().unwrap();
tcp.write(&[PacketType::Resync.ordinal() as u8]).unwrap(); tcp.write(&[PacketType::Resync.ordinal() as u8]).unwrap();
tcp.write(&id.to_be_bytes()).unwrap();
tcp.write_now().unwrap(); tcp.write_now().unwrap();
eprintln!( eprintln!(
"Sent resync packet. Server should now wait 8 seconds and then send a resync-echo packet." "Sent resync packet. Server should now wait 8 seconds and then send a resync-echo packet."
@ -98,6 +100,8 @@ fn resync(tcp: &mut SocketAdapter) {
eprintln!("Trying to receive the resync echo..."); eprintln!("Trying to receive the resync echo...");
tcp.read_now(&mut buf).unwrap(); tcp.read_now(&mut buf).unwrap();
if buf[0] as i8 == PacketType::ResyncEcho.ordinal() { if buf[0] as i8 == PacketType::ResyncEcho.ordinal() {
tcp.read_now(&mut buf8).unwrap();
*id = u64::from_be_bytes(buf8);
eprintln!("Successfully resynced. RevPFW3 can continue."); eprintln!("Successfully resynced. RevPFW3 can continue.");
} else { } else {
eprintln!("Resync was not successful. Stopping."); eprintln!("Resync was not successful. Stopping.");
@ -189,7 +193,7 @@ pub fn client(params: ClientParams) {
} }
let Some(pt) = PacketType::from_ordinal(buf1[0] as i8) else { let Some(pt) = PacketType::from_ordinal(buf1[0] as i8) else {
resync(&mut tcp); resync(&mut tcp, &mut id);
continue; continue;
}; };
match pt { match pt {
@ -225,7 +229,7 @@ pub fn client(params: ClientParams) {
} }
} }
PacketType::ServerData => resync(&mut tcp), PacketType::ServerData => resync(&mut tcp, &mut id),
PacketType::ClientExceededBuffer => { PacketType::ClientExceededBuffer => {
tcp.read_now(&mut buf8).unwrap(); tcp.read_now(&mut buf8).unwrap();
@ -244,11 +248,11 @@ pub fn client(params: ClientParams) {
tcp.internal.set_print(false); tcp.internal.set_print(false);
eprintln!("Server asked for re-sync. Waiting 8 seconds, then initiating resync."); eprintln!("Server asked for re-sync. Waiting 8 seconds, then initiating resync.");
thread::sleep(Duration::from_secs(8)); thread::sleep(Duration::from_secs(8));
resync(&mut tcp); resync(&mut tcp, &mut id);
} }
// this one shouldnt happen. // this one shouldnt happen.
PacketType::ResyncEcho => resync(&mut tcp), PacketType::ResyncEcho => resync(&mut tcp, &mut id),
} }
} }
} }

4
src/server.rs
View file

@ -28,7 +28,6 @@ fn resync(tcp: &mut SocketAdapter) {
// read all packets that are still pending. // read all packets that are still pending.
while let Some(Some(_x @ 1..)) = tcp.poll(&mut buf).ok() {} while let Some(Some(_x @ 1..)) = tcp.poll(&mut buf).ok() {}
// client should now have stopped sending packets. // client should now have stopped sending packets.
tcp.internal.set_print(true);
} }
pub fn server(port: u16, key: &str, sleep_delay_ms: u64) { pub fn server(port: u16, key: &str, sleep_delay_ms: u64) {
@ -180,10 +179,13 @@ pub fn server(port: u16, key: &str, sleep_delay_ms: u64) {
eprintln!( eprintln!(
"Client asked for a re-sync. Waiting 8 seconds, then sending resync-echo." "Client asked for a re-sync. Waiting 8 seconds, then sending resync-echo."
); );
tcp.read_now(&mut buf8).unwrap();
id = u64::from_be_bytes(buf8).max(id);
tcp.write_now().unwrap(); tcp.write_now().unwrap();
thread::sleep(Duration::from_secs(8)); thread::sleep(Duration::from_secs(8));
tcp.write(&[PacketType::ResyncEcho.ordinal() as u8]) tcp.write(&[PacketType::ResyncEcho.ordinal() as u8])
.unwrap(); .unwrap();
tcp.write(&id.to_be_bytes()).unwrap();
tcp.write_now().unwrap(); tcp.write_now().unwrap();
eprintln!("Resync-Echo sent. Going back to normal operation."); eprintln!("Resync-Echo sent. Going back to normal operation.");
tcp.internal.set_print(true); tcp.internal.set_print(true);