even better reliability

TudbuT · Aug 20, 2022 · b3933dd · b3933dd
1 parent 7a18273
commit b3933dd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qft"
-version = "0.4.5"
+version = "0.4.6"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/src/main.rs b/src/main.rs
@@ -154,13 +154,16 @@ impl SafeReadWrite {
             break;
         }
         let mut buf = [0, 0, 0];
+        let mut wait = idn == 0xffff || flush;
         if self.last_transmitted.len() < 100 {
             self.socket
                 .set_read_timeout(Some(Duration::from_millis(1)))
                 .unwrap();
         }
-        let mut wait = idn == 0xffff || flush;
-        let start = unix_millis();
+        else {
+            wait = true;
+        }
+        let mut start = unix_millis();
         if idn == 0xffff {
             print!("\r\x1b[KPacket ID needs to wrap. Waiting for partner to catch up...")
         }
@@ -220,11 +223,11 @@ impl SafeReadWrite {
                 None => {
                     if unix_millis() - start > 10000 {
                         println!("\r\x1b[K10s passed since last packet ==> Contact broke. Trying to resend packet...");
+                        let buf = self
+                            .last_transmitted
+                            .get(&idn)
+                            .expect("Unable to recover from connection loss.");
                         loop {
-                            let buf = self
-                                .last_transmitted
-                                .get(&idn)
-                                .expect("Unable to recover from connection loss.");
                             match self.socket.send(buf) {
                                 Ok(x) => {
                                     if x != buf.len() {
@@ -237,7 +240,7 @@ impl SafeReadWrite {
                             }
                             break;
                         }
-                        break;
+                        start = unix_millis();
                     }
                     if !wait {
                         break;