ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hook up global ssl config with webserver

Browse Source
This commit is contained in:
Michael Zanetti 2017-08-03 17:31:27 +02:00
parent d478f98990
commit 424150dc8a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/servermanager.cpp
View File

@ -106,7 +106,7 @@ ServerManager::ServerManager(GuhConfiguration* configuration, QObject *parent) :
m_jsonServer->registerTransportInterface(m_bluetoothServer, configuration->bluetoothServerEnabled()); m_jsonServer->registerTransportInterface(m_bluetoothServer, configuration->bluetoothServerEnabled());
// Register transport itnerfaces for the Webserver // Register transport itnerfaces for the Webserver
m_webServer = new WebServer(configuration->webServerAddress(), configuration->webServerPort(), configuration->webServerPublicFolder(), this); m_webServer = new WebServer(configuration->webServerAddress(), configuration->webServerPort(), configuration->webServerPublicFolder(), configuration->sslEnabled(), m_sslConfiguration, this);
m_restServer->registerWebserver(m_webServer); m_restServer->registerWebserver(m_webServer);
} }

5
server/webserver.cpp
View File

@ -95,13 +95,14 @@ namespace guhserver {
* *
* \sa ServerManager * \sa ServerManager
*/ */
WebServer::WebServer(const QHostAddress &host, const uint &port, const QString &publicFolder, QObject *parent) : WebServer::WebServer(const QHostAddress &host, const uint &port, const QString &publicFolder, bool sslEnabled, const QSslConfiguration &sslConfiguration, QObject *parent) :
QTcpServer(parent), QTcpServer(parent),
m_avahiService(NULL), m_avahiService(NULL),
m_host(host), m_host(host),
m_port(port), m_port(port),
m_webinterfaceDir(publicFolder), m_webinterfaceDir(publicFolder),
m_useSsl(false), m_sslConfiguration(sslConfiguration),
m_useSsl(sslEnabled),
m_enabled(false) m_enabled(false)
{ {
if (QCoreApplication::instance()->organizationName() == "guh-test") { if (QCoreApplication::instance()->organizationName() == "guh-test") {

2
server/webserver.h
View File

@ -72,7 +72,7 @@ class WebServer : public QTcpServer
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit WebServer(const QHostAddress &host, const uint &port, const QString &publicFolder, QObject *parent = 0); explicit WebServer(const QHostAddress &host, const uint &port, const QString &publicFolder, bool sslEnabled, const QSslConfiguration &sslConfiguration, QObject *parent = 0);
~WebServer(); ~WebServer();
void sendHttpReply(HttpReply *reply); void sendHttpReply(HttpReply *reply);