jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 08:14:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Client Websockets (#3545)

Browse source 
* Websockets

* Add setting to get websocket IP from header

* Add QT version guard

* Minor cleanup

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* - Make QWebSocket required
- Remove QWEBSOCEKT_LIB guards
- Only TCP on port 4747
- Fix peerName lookup

* fix check

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* Update CMakeLists.txt

* Update CMakeLists.txt
This commit is contained in:
Rob Blanckaert 2019-02-03 02:43:22 -08:00 • committed by ctrlaltca
parent 5e38214675
commit 9a8c81cf5e
8 changed files with 130 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

13
servatrice/src/serversocketinterface.h
View file

@ -20,13 +20,11 @@
#ifndef SERVERSOCKETINTERFACE_H
#define SERVERSOCKETINTERFACE_H
#include <QTcpSocket>
#ifdef QT_WEBSOCKETS_LIB
#include <QWebSocket>
#endif
#include "server_protocolhandler.h"
#include <QHostAddress>
#include <QMutex>
#include <QTcpSocket>
#include <QWebSocket>
class Servatrice;
class Servatrice_DatabaseInterface;
@ -181,7 +179,6 @@ public slots:
void initConnection(int socketDescriptor);
};
#ifdef QT_WEBSOCKETS_LIB
class WebsocketServerSocketInterface : public AbstractServerSocketInterface
{
Q_OBJECT
@ -193,11 +190,11 @@ public:
QHostAddress getPeerAddress() const
{
return socket->peerAddress();
return address;
}
QString getAddress() const
{
return socket->peerAddress().toString();
return address.toString();
}
QString getConnectionType() const
{
@ -206,6 +203,7 @@ public:
private:
QWebSocket *socket;
QHostAddress address;
protected:
void writeToSocket(QByteArray &data)
@ -223,6 +221,5 @@ protected slots:
public slots:
void initConnection(void *_socket);
};
#endif
#endif