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

Merge pull request #1 from jcwenger/feature/interleaved-channels 

Feature/interleaved channels
develop
jcwenger 2020-05-10 19:54:03 -05:00 committed by GitHub
parent 1d91dec240 d387974e9d
commit b2733fe146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/f1x/aasdk/Messenger/MessageInStream.hpp
View File

@ -18,11 +18,13 @@
#pragma once #pragma once
#include <map>
#include <f1x/aasdk/Transport/ITransport.hpp> #include <f1x/aasdk/Transport/ITransport.hpp>
#include <f1x/aasdk/Messenger/IMessageInStream.hpp> #include <f1x/aasdk/Messenger/IMessageInStream.hpp>
#include <f1x/aasdk/Messenger/ICryptor.hpp> #include <f1x/aasdk/Messenger/ICryptor.hpp>
#include <f1x/aasdk/Messenger/FrameHeader.hpp> #include <f1x/aasdk/Messenger/FrameHeader.hpp>
#include <f1x/aasdk/Messenger/FrameSize.hpp> #include <f1x/aasdk/Messenger/FrameSize.hpp>
#include <f1x/aasdk/Messenger/FrameType.hpp>
namespace f1x namespace f1x
{ {
@ -51,6 +53,7 @@ private:
FrameType recentFrameType_; FrameType recentFrameType_;
ReceivePromise::Pointer promise_; ReceivePromise::Pointer promise_;
Message::Pointer message_; Message::Pointer message_;
std::map<messenger::ChannelId, Message::Pointer> messageBuffer_;
}; };
} }

29
src/Messenger/MessageInStream.cpp
View File

@ -64,17 +64,30 @@ void MessageInStream::receiveFrameHeaderHandler(const common::DataConstBuffer& b
{ {
FrameHeader frameHeader(buffer); FrameHeader frameHeader(buffer);
if(message_ == nullptr) if(message_ != nullptr && message_->getChannelId() != frameHeader.getChannelId())
{
messageBuffer_[message_->getChannelId()] = message_;
message_ = nullptr;
}
auto bufferedMessage = messageBuffer_.find(frameHeader.getChannelId());
if(bufferedMessage != messageBuffer_.end())
{
if(frameHeader.getType() != FrameType::FIRST)
{
message_ = bufferedMessage->second;
}
else
{
message_ = std::make_shared<Message>(frameHeader.getChannelId(), frameHeader.getEncryptionType(), frameHeader.getMessageType());
}
messageBuffer_.erase(bufferedMessage);
}
else if(message_ == nullptr)
{ {
message_ = std::make_shared<Message>(frameHeader.getChannelId(), frameHeader.getEncryptionType(), frameHeader.getMessageType()); message_ = std::make_shared<Message>(frameHeader.getChannelId(), frameHeader.getEncryptionType(), frameHeader.getMessageType());
} }
else if(message_->getChannelId() != frameHeader.getChannelId())
{
message_.reset();
promise_->reject(error::Error(error::ErrorCode::MESSENGER_INTERTWINED_CHANNELS));
promise_.reset();
return;
}
recentFrameType_ = frameHeader.getType(); recentFrameType_ = frameHeader.getType();
const size_t frameSize = FrameSize::getSizeOf(frameHeader.getType() == FrameType::FIRST ? FrameSizeType::EXTENDED : FrameSizeType::SHORT); const size_t frameSize = FrameSize::getSizeOf(frameHeader.getType() == FrameType::FIRST ? FrameSizeType::EXTENDED : FrameSizeType::SHORT);