Start handling TNC->host messages with KissBuffer

diff --git a/m17app/src/app.rs b/m17app/src/app.rs
index 0ad196d6dc217f41d40d0fbc97d9f95743d04ed4..9c2815de50c4fbe53cc6280ef2a47ebe2630094c 100644 (file)
--- a/m17app/src/app.rs
+++ b/m17app/src/app.rs
@@ -1,5 +1,5 @@
 use crate::tnc::Tnc;
 use crate::tnc::Tnc;

-use m17core::kiss::KissFrame;
+use m17core::kiss::{KissBuffer, KissCommand, KissFrame};

 use m17core::protocol::PacketType;
 use m17core::traits::{PacketListener, StreamListener};
 
 use m17core::protocol::PacketType;
 use m17core::traits::{PacketListener, StreamListener};
 


@@ -105,20 +105,31 @@ enum TncControlEvent {
 
 fn spawn_reader<T: Tnc + Send + 'static>(mut tnc: T, listeners: Arc<RwLock<Listeners>>) {
     std::thread::spawn(move || {
 
 fn spawn_reader<T: Tnc + Send + 'static>(mut tnc: T, listeners: Arc<RwLock<Listeners>>) {
     std::thread::spawn(move || {

-        let mut buf = [0u8; 1713];
-        let mut n = 0;
+        let mut kiss_buffer = KissBuffer::new();

         loop {
         loop {

-            // I want to call tnc.read() here
-            // Probably these needs a helper in m17core::kiss? It will be common to both TNC and host
-
-            // After a read...
-            // if this does not start with FEND, forget all data up until first FEND
-            // if we start with a FEND, see if there is another FEND with at least one byte between
-            // for each such case, turn that FEND..=FEND slice into a KissFrame and attempt to parse it
-            // once all such pairs have been handled...
-            // move the last FEND onwards back to the start of the buffer
-            //   - if there is no room to do so, this is an oversize frame. purge everything and carry on.
-            // perform next read from end
+            let mut buf = kiss_buffer.buf_remaining();
+            let n = match tnc.read(&mut buf) {
+                Ok(n) => n,
+                Err(_) => break,
+            };
+            kiss_buffer.did_write(n);
+            while let Some(frame) = kiss_buffer.next_frame() {
+                if frame.command() != Ok(KissCommand::DataFrame) {
+                    continue;
+                }
+                match frame.port() {
+                    Ok(0) => {
+                        // handle basic frame and send it to subscribers
+                    }
+                    Ok(1) => {
+                        // handle full frame and send it to subscribers - I guess they need to know the type, probably not the CRC
+                    }
+                    Ok(2) => {
+                        // handle stream and send it to subscribers
+                    }
+                    _ => (),
+                }
+            }

         }
     });
 }
         }
     });
 }

diff --git a/m17core/src/kiss.rs b/m17core/src/kiss.rs
index 3770784030e977be9dd0e72414067c08e43c3d1f..b8c2f1fc76e261f66fa1d797031f51680445ebc4 100644 (file)
--- a/m17core/src/kiss.rs
+++ b/m17core/src/kiss.rs
@@ -382,7 +382,7 @@ impl KissBuffer {
     }
 }
 
     }
 }
 

-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq, Clone)]

 pub enum KissError {
     MalformedKissFrame,
     UnsupportedKissCommand,
 pub enum KissError {
     MalformedKissFrame,
     UnsupportedKissCommand,