strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

wsd: forwardToPeer now takes pre-constructed Message

Browse source 
Change-Id: I58acbeb6d27fbc9b99434c2743f69a4faa3a048b
Reviewed-on: https://gerrit.libreoffice.org/33430
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2017-01-21 20:13:09 -05:00 committed by Ashod Nakashian
parent bb4733b6d6
commit 8c34244285
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
wsd/PrisonerSession.cpp
View file

@ -108,7 +108,10 @@ bool PrisonerSession::_handleInput(const char *buffer, int length)
errorKind == "passwordrequired:to-modify" ||
errorKind == "wrongpassword")
{
forwardToPeer(peer, buffer, length, false);
const auto payload = std::make_shared<Message>(buffer, length,
Message::Dir::Out,
Message::Type::Text);
forwardToPeer(peer, payload);
LOG_WRN("Document load failed: " << errorKind);
return false;
}
@ -175,7 +178,10 @@ bool PrisonerSession::_handleInput(const char *buffer, int length)
_docBroker->setLoaded();
// Forward the status response to the client.
return forwardToPeer(peer, buffer, length, false);
const auto payload = std::make_shared<Message>(buffer, length,
Message::Dir::Out,
Message::Type::Text);
return forwardToPeer(peer, payload);
}
else if (tokens[0] == "commandvalues:")
{
@ -242,8 +248,10 @@ bool PrisonerSession::_handleInput(const char *buffer, int length)
getTokenString(tokens[2], "char", text);
assert(firstLine.size() < static_cast<std::string::size_type>(length));
_docBroker->tileCache().saveRendering(font+text, "font", buffer + firstLine.size() + 1, length - firstLine.size() - 1);
forwardToPeer(peer, buffer, length, true);
return true;
const auto payload = std::make_shared<Message>(buffer, length,
Message::Dir::Out,
Message::Type::Binary);
return forwardToPeer(peer, payload);
}
}
else
@ -257,14 +265,17 @@ bool PrisonerSession::_handleInput(const char *buffer, int length)
const bool isBinary = buffer[length - 1] != '}' && firstLine.find('{') == std::string::npos;
// Forward everything else.
forwardToPeer(peer, buffer, length, isBinary);
return true;
const auto payload = std::make_shared<Message>(buffer, length,
Message::Dir::Out,
isBinary ? Message::Type::Binary
: Message::Type::Text);
return forwardToPeer(peer, payload);
}
bool PrisonerSession::forwardToPeer(const std::shared_ptr<ClientSession>& clientSession,
const char* buffer, int length, const bool binary)
const std::shared_ptr<Message>& payload)
{
const auto message = LOOLProtocol::getAbbreviatedMessage(buffer, length);
const auto& message = payload->abbr();
if (clientSession->isCloseFrame())
{
@ -280,11 +291,6 @@ bool PrisonerSession::forwardToPeer(const std::shared_ptr<ClientSession>& client
}
LOG_TRC(getName() << " -> " << clientSession->getName() << ": " << message);
auto payload = std::make_shared<Message>(buffer, length,
Message::Dir::Out,
binary ? Message::Type::Binary
: Message::Type::Text);
clientSession->enqueueSendMessage(payload);
return true;

2
wsd/PrisonerSession.hpp
View file

@ -35,7 +35,7 @@ private:
virtual bool _handleInput(const char* buffer, int length) override;
bool forwardToPeer(const std::shared_ptr<ClientSession>& clientSession,
const char* buffer, int length, const bool binary);
const std::shared_ptr<Message>& payload);
private:
std::shared_ptr<DocumentBroker> _docBroker;