haraldwolff
/
aasdk
mirror of https://github.com/opencardev/aasdk
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Swap getSize() to getFrameSize() and add totalSize() for completeness.

pull/15/head
Simon.Dean 2022-02-11 10:19:12 +00:00
parent 6d7eda1bcb
commit a897fc1a8b
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/aasdk/Messenger/FrameSize.hpp
View File

@ -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);

9
src/Messenger/FrameSize.cpp
View File

@ -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;

3
src/Messenger/MessageInStream.cpp
View File

@ -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)