Skip to content

Commit dd7a5d7

Browse files
committed
update to the latest oatpp API.
1 parent 580af7a commit dd7a5d7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

client/src/ClientSocketListener.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ClientSocketListener : public oatpp::websocket::AsyncWebSocket::Listener{
3333
/**
3434
* Buffer for messages. Needed for multi-frame messages.
3535
*/
36-
oatpp::data::stream::ChunkedBuffer m_messageBuffer;
36+
oatpp::data::stream::BufferOutputStream m_messageBuffer;
3737
public:
3838

3939
/**
@@ -69,7 +69,7 @@ class ClientSocketListener : public oatpp::websocket::AsyncWebSocket::Listener{
6969

7070
auto wholeMessage = m_messageBuffer.toString();
7171
// TODO do something with message
72-
m_messageBuffer.clear();
72+
m_messageBuffer.setCurrentPosition(0);
7373
++ MESSAGES;
7474

7575
} else if(size > 0) { // message frame received

server/src/controller/WebSocketListener.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class WebSocketListener : public oatpp::websocket::AsyncWebSocket::Listener {
2727
/**
2828
* Buffer for messages. Needed for multi-frame messages.
2929
*/
30-
oatpp::data::stream::ChunkedBuffer m_messageBuffer;
30+
oatpp::data::stream::BufferOutputStream m_messageBuffer;
3131
public:
3232

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

6464
auto wholeMessage = m_messageBuffer.toString();
65-
m_messageBuffer.clear();
65+
m_messageBuffer.setCurrentPosition(0);
6666
++ MESSAGES;
6767

6868
/* Send message in reply */

server/test/WebSocketTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class TestComponent {
9696

9797
class ClientSocketListener : public oatpp::websocket::AsyncWebSocket::Listener{
9898
private:
99-
oatpp::data::stream::ChunkedBuffer m_messageBuffer;
99+
oatpp::data::stream::BufferOutputStream m_messageBuffer;
100100
public:
101101

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

0 commit comments

Comments
 (0)