Skip to content

Add callback type parameters to the callback function #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CMaicss wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add callback type parameters to the callback function #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions easywsclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,9 @@ class _RealWebSocket : public easywsclient::WebSocket
{
Callback_Imp& callable;
CallbackAdapter(Callback_Imp& callable) : callable(callable) { }
void operator()(const std::vector<uint8_t>& message) {
void operator()(easywsclient::callbackType type, const std::vector<uint8_t>& message) {
std::string stringMessage(message.begin(), message.end());
callable(stringMessage);
callable(type, stringMessage);
}
};
CallbackAdapter bytesCallback(callable);
Expand Down Expand Up @@ -347,7 +347,7 @@ class _RealWebSocket : public easywsclient::WebSocket
if (ws.mask) { for (size_t i = 0; i != ws.N; ++i) { rxbuf[i+ws.header_size] ^= ws.masking_key[i&0x3]; } }
receivedData.insert(receivedData.end(), rxbuf.begin()+ws.header_size, rxbuf.begin()+ws.header_size+(size_t)ws.N);// just feed
if (ws.fin) {
callable((const std::vector<uint8_t>) receivedData);
callable(easywsclient::callbackType::MESSAGE, (const std::vector<uint8_t>) receivedData);
receivedData.erase(receivedData.begin(), receivedData.end());
std::vector<uint8_t> ().swap(receivedData);// free memory
}
Expand All @@ -357,8 +357,13 @@ class _RealWebSocket : public easywsclient::WebSocket
std::string data(rxbuf.begin()+ws.header_size, rxbuf.begin()+ws.header_size+(size_t)ws.N);
sendData(wsheader_type::PONG, data.size(), data.begin(), data.end());
}
else if (ws.opcode == wsheader_type::PONG) { }
else if (ws.opcode == wsheader_type::CLOSE) { close(); }
else if (ws.opcode == wsheader_type::PONG) {
callable(easywsclient::callbackType::PONG, {});
}
else if (ws.opcode == wsheader_type::CLOSE) {
callable(easywsclient::callbackType::CLOSE, {});
close();
}
else { fprintf(stderr, "ERROR: Got unexpected WebSocket message.\n"); close(); }

rxbuf.erase(rxbuf.begin(), rxbuf.begin() + ws.header_size+(size_t)ws.N);
Expand Down
9 changes: 5 additions & 4 deletions easywsclient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
#include <vector>

namespace easywsclient {
typedef enum callbackType { MESSAGE, PONG, CLOSE } callbackType;

struct Callback_Imp { virtual void operator()(const std::string& message) = 0; };
struct BytesCallback_Imp { virtual void operator()(const std::vector<uint8_t>& message) = 0; };
struct Callback_Imp { virtual void operator()(callbackType type, const std::string& message) = 0; };
struct BytesCallback_Imp { virtual void operator()(callbackType type, const std::vector<uint8_t>& message) = 0; };

class WebSocket {
public:
Expand Down Expand Up @@ -43,7 +44,7 @@ class WebSocket {
struct _Callback : public Callback_Imp {
Callable& callable;
_Callback(Callable& callable) : callable(callable) { }
void operator()(const std::string& message) { callable(message); }
void operator()(callbackType type, const std::string& message) { callable(type, message); }
};
_Callback callback(callable);
_dispatch(callback);
Expand All @@ -56,7 +57,7 @@ class WebSocket {
struct _Callback : public BytesCallback_Imp {
Callable& callable;
_Callback(Callable& callable) : callable(callable) { }
void operator()(const std::vector<uint8_t>& message) { callable(message); }
void operator()(callbackType type, const std::vector<uint8_t>& message) { callable(type, message); }
};
_Callback callback(callable);
_dispatchBinary(callback);
Expand Down