From a897fc1a8b1a5efa98535d7ffe8af3fba88de751 Mon Sep 17 00:00:00 2001
From: "Simon.Dean" <sjdean@blargle.co.uk>
Date: Fri, 11 Feb 2022 10:19:12 +0000
Subject: [PATCH] Swap getSize() to getFrameSize() and add totalSize() for
 completeness.

---
 include/aasdk/Messenger/FrameSize.hpp | 3 ++-
 src/Messenger/FrameSize.cpp           | 9 ++++++++-
 src/Messenger/MessageInStream.cpp     | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/aasdk/Messenger/FrameSize.hpp b/include/aasdk/Messenger/FrameSize.hpp
index d779819..d9b0637 100644
--- a/include/aasdk/Messenger/FrameSize.hpp
+++ b/include/aasdk/Messenger/FrameSize.hpp
@@ -35,7 +35,8 @@ public:
     FrameSize(const common::DataConstBuffer& buffer);
 
     common::Data getData() const;
-    size_t getSize() const;
+    size_t getFrameSize() const;
+    size_t getTotalSize() const;
 
     static size_t getSizeOf(FrameSizeType type);
 
diff --git a/src/Messenger/FrameSize.cpp b/src/Messenger/FrameSize.cpp
index 6f987c3..e92f35a 100644
--- a/src/Messenger/FrameSize.cpp
+++ b/src/Messenger/FrameSize.cpp
@@ -47,6 +47,7 @@ FrameSize::FrameSize(const common::DataConstBuffer& buffer)
     {
         frameSizeType_ = FrameSizeType::SHORT;
         frameSize_ = boost::endian::big_to_native(reinterpret_cast<const uint16_t&>(buffer.cdata[0]));
+        totalSize_ = frameSize_;
     }
 
     if(buffer.size >= 6)
@@ -74,11 +75,17 @@ common::Data FrameSize::getData() const
     return data;
 }
 
-size_t FrameSize::getSize() const
+size_t FrameSize::getFrameSize() const
 {
     return frameSize_;
 }
 
+size_t FrameSize::getTotalSize() const
+{
+    return totalSize_;
+}
+
+
 size_t FrameSize::getSizeOf(FrameSizeType type)
 {
     return type == FrameSizeType::EXTENDED ? 6 : 2;
diff --git a/src/Messenger/MessageInStream.cpp b/src/Messenger/MessageInStream.cpp
index cd0b525..9c63801 100644
--- a/src/Messenger/MessageInStream.cpp
+++ b/src/Messenger/MessageInStream.cpp
@@ -119,7 +119,8 @@ void MessageInStream::receiveFrameSizeHandler(const common::DataConstBuffer& buf
         });
 
     FrameSize frameSize(buffer);
-    transport_->receive(frameSize.getSize(), std::move(transportPromise));
+    frameSize_ = (int) frameSize.getFrameSize();
+    transport_->receive(frameSize.getFrameSize(), std::move(transportPromise));
 }
 
 void MessageInStream::receiveFramePayloadHandler(const common::DataConstBuffer& buffer)