Add support for frame resizing. Handle old stream frame type in encoder.

mobilinkd · Jul 9, 2021 · fc7a25c · fc7a25c
1 parent 5398bc0
commit fc7a25c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/TNC/HdlcFrame.hpp b/TNC/HdlcFrame.hpp
@@ -101,6 +101,7 @@ class Frame : public list_base_hook<>
     }
 
     uint16_t size() const {return data_.size();}
+    bool resize(uint16_t size) {return data_.resize(size);}
 
     uint16_t crc() const {return crc_;}
     uint16_t fcs() const {return fcs_;}
@@ -170,12 +171,10 @@ class FramePool
             free_list_.pop_front();
         }
         taskEXIT_CRITICAL_FROM_ISR(x);
-        DEBUG("Acquired frame %p (size after = %d)", result, free_list_.size());
         return result;
     }
 
     void release(frame_type* frame) {
-        DEBUG("Released frame %p (size before = %d)", frame, free_list_.size());
         frame->clear();
         auto x = taskENTER_CRITICAL_FROM_ISR();
         free_list_.push_back(*frame);

diff --git a/TNC/M17Encoder.cpp b/TNC/M17Encoder.cpp
@@ -224,6 +224,12 @@ void M17Encoder::process_stream(tnc::hdlc::IoFrame* frame, FrameType type)
         {
             send_stream(frame, type);   // Consumes frame.
         }
+        else if (frame->size() == 26)
+        {
+            // Old-style frame with trailing CRC.
+            frame->resize(24);
+            send_stream(frame, type);
+        }
         else
         {
             WARN("Unexpected AUDIO frame size = %u", frame->size());

diff --git a/TNC/SegmentedBuffer.hpp b/TNC/SegmentedBuffer.hpp
@@ -81,6 +81,23 @@ struct SegmentedBuffer {
 
     uint16_t size() const {return size_;}
 
+    bool resize(uint16_t size)
+    {
+        if (size <= size_)
+        {
+            size_ = size;
+        }
+        else
+        {
+            for (;size_ != size;)
+            {
+                if (!push_back(value_type()))
+                    return false;
+            }
+        }
+        return true;
+    }
+
     bool push_back(value_type value) {
         uint16_t offset = size_ & 0xFF;
         if (offset == 0) { // Must allocate.