Skip to content

Commit

Permalink
update to the latest oatpp API.
Browse files Browse the repository at this point in the history
  • Loading branch information
lganzzzo committed Nov 16, 2021
1 parent 580af7a commit dd7a5d7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions client/src/ClientSocketListener.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ClientSocketListener : public oatpp::websocket::AsyncWebSocket::Listener{
/**
* Buffer for messages. Needed for multi-frame messages.
*/
oatpp::data::stream::ChunkedBuffer m_messageBuffer;
oatpp::data::stream::BufferOutputStream m_messageBuffer;
public:

/**
Expand Down Expand Up @@ -69,7 +69,7 @@ class ClientSocketListener : public oatpp::websocket::AsyncWebSocket::Listener{

auto wholeMessage = m_messageBuffer.toString();
// TODO do something with message
m_messageBuffer.clear();
m_messageBuffer.setCurrentPosition(0);
++ MESSAGES;

} else if(size > 0) { // message frame received
Expand Down
4 changes: 2 additions & 2 deletions server/src/controller/WebSocketListener.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class WebSocketListener : public oatpp::websocket::AsyncWebSocket::Listener {
/**
* Buffer for messages. Needed for multi-frame messages.
*/
oatpp::data::stream::ChunkedBuffer m_messageBuffer;
oatpp::data::stream::BufferOutputStream m_messageBuffer;
public:

/**
Expand Down Expand Up @@ -62,7 +62,7 @@ class WebSocketListener : public oatpp::websocket::AsyncWebSocket::Listener {
if(size == 0) { // message transfer finished

auto wholeMessage = m_messageBuffer.toString();
m_messageBuffer.clear();
m_messageBuffer.setCurrentPosition(0);
++ MESSAGES;

/* Send message in reply */
Expand Down
4 changes: 2 additions & 2 deletions server/test/WebSocketTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class TestComponent {

class ClientSocketListener : public oatpp::websocket::AsyncWebSocket::Listener{
private:
oatpp::data::stream::ChunkedBuffer m_messageBuffer;
oatpp::data::stream::BufferOutputStream m_messageBuffer;
public:

CoroutineStarter onPing(const std::shared_ptr<AsyncWebSocket>& socket, const oatpp::String& message) override {
Expand All @@ -114,7 +114,7 @@ class ClientSocketListener : public oatpp::websocket::AsyncWebSocket::Listener{
CoroutineStarter readMessage(const std::shared_ptr<AsyncWebSocket>& socket, v_uint8 opcode, p_char8 data, oatpp::v_io_size size) override {
if(size == 0) {
auto wholeMessage = m_messageBuffer.toString();
m_messageBuffer.clear();
m_messageBuffer.setCurrentPosition(0);
OATPP_LOGD("client", "received %s", wholeMessage->c_str());
} else if(size > 0) {
m_messageBuffer.writeSimple(data, size);
Expand Down

0 comments on commit dd7a5d7

Please sign in to comment.