Added some const
This commit is contained in:
+8
-8
@@ -69,7 +69,7 @@
|
||||
|
||||
namespace { // private module-only namespace
|
||||
|
||||
socket_t hostname_connect(std::string hostname, int port) {
|
||||
socket_t hostname_connect(const std::string& hostname, int port) {
|
||||
struct addrinfo hints;
|
||||
struct addrinfo *result;
|
||||
struct addrinfo *p;
|
||||
@@ -108,10 +108,10 @@ class _DummyWebSocket : public easywsclient::WebSocket
|
||||
{
|
||||
public:
|
||||
void poll(int timeout) { }
|
||||
void send(std::string message) { }
|
||||
void send(const std::string& message) { }
|
||||
void close() { }
|
||||
void _dispatch(Callback & callable) { }
|
||||
readyStateValues getReadyState() { return CLOSED; }
|
||||
readyStateValues getReadyState() const { return CLOSED; }
|
||||
};
|
||||
|
||||
|
||||
@@ -174,7 +174,7 @@ class _RealWebSocket : public easywsclient::WebSocket
|
||||
_RealWebSocket(socket_t sockfd, bool useMask) : sockfd(sockfd), readyState(OPEN), useMask(useMask) {
|
||||
}
|
||||
|
||||
readyStateValues getReadyState() {
|
||||
readyStateValues getReadyState() const {
|
||||
return readyState;
|
||||
}
|
||||
|
||||
@@ -312,7 +312,7 @@ class _RealWebSocket : public easywsclient::WebSocket
|
||||
}
|
||||
}
|
||||
|
||||
void send(std::string message) {
|
||||
void send(const std::string& message) {
|
||||
// TODO:
|
||||
// Masking key should (must) be derived from a high quality random
|
||||
// number generator, to mitigate attacks on non-WebSocket friendly
|
||||
@@ -381,7 +381,7 @@ class _RealWebSocket : public easywsclient::WebSocket
|
||||
};
|
||||
|
||||
|
||||
easywsclient::WebSocket::pointer from_url(std::string url, bool useMask) {
|
||||
easywsclient::WebSocket::pointer from_url(const std::string& url, bool useMask) {
|
||||
char host[128];
|
||||
int port;
|
||||
char path[128];
|
||||
@@ -463,11 +463,11 @@ WebSocket::pointer WebSocket::create_dummy() {
|
||||
}
|
||||
|
||||
|
||||
WebSocket::pointer WebSocket::from_url(std::string url) {
|
||||
WebSocket::pointer WebSocket::from_url(const std::string& url) {
|
||||
return ::from_url(url, true);
|
||||
}
|
||||
|
||||
WebSocket::pointer WebSocket::from_url_no_mask(std::string url) {
|
||||
WebSocket::pointer WebSocket::from_url_no_mask(const std::string& url) {
|
||||
return ::from_url(url, false);
|
||||
}
|
||||
|
||||
|
||||
+9
-9
@@ -19,29 +19,29 @@ class WebSocket {
|
||||
|
||||
// Factories:
|
||||
static pointer create_dummy();
|
||||
static pointer from_url(std::string url);
|
||||
static pointer from_url_no_mask(std::string url);
|
||||
static pointer from_url(const std::string& url);
|
||||
static pointer from_url_no_mask(const std::string& url);
|
||||
|
||||
// Interfaces:
|
||||
virtual ~WebSocket() { }
|
||||
virtual void poll(int timeout = 0) = 0; // timeout in milliseconds
|
||||
virtual void send(std::string message) = 0;
|
||||
virtual void send(const std::string& message) = 0;
|
||||
virtual void close() = 0;
|
||||
virtual readyStateValues getReadyState() = 0;
|
||||
virtual readyStateValues getReadyState() const = 0;
|
||||
template<class Callable>
|
||||
void dispatch(Callable callable) { // N.B. this is compatible with both C++11 lambdas, functors and C function pointers
|
||||
struct _Callback : public Callback {
|
||||
Callable & callable;
|
||||
_Callback(Callable & callable) : callable(callable) { }
|
||||
void operator()(const std::string & message) { callable(message); }
|
||||
Callable& callable;
|
||||
_Callback(Callable& callable) : callable(callable) { }
|
||||
void operator()(const std::string& message) { callable(message); }
|
||||
};
|
||||
_Callback callback(callable);
|
||||
_dispatch(callback);
|
||||
}
|
||||
|
||||
protected:
|
||||
struct Callback { virtual void operator()(const std::string & message) = 0; };
|
||||
virtual void _dispatch(Callback & callable) = 0;
|
||||
struct Callback { virtual void operator()(const std::string& message) = 0; };
|
||||
virtual void _dispatch(Callback& callable) = 0;
|
||||
};
|
||||
|
||||
} // namespace easywsclient
|
||||
|
||||
Reference in New Issue
Block a user