mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-22 22:05:18 +02:00
Remove https unneeded crust
This commit is contained in:
parent
5efc046316
commit
162c2f031b
3 changed files with 2 additions and 23 deletions
|
@ -6,18 +6,4 @@ setup_hifi_project(Network)
|
||||||
# link the shared hifi libraries
|
# link the shared hifi libraries
|
||||||
link_hifi_libraries(embedded-webserver networking shared)
|
link_hifi_libraries(embedded-webserver networking shared)
|
||||||
|
|
||||||
# find OpenSSL
|
|
||||||
find_package(OpenSSL REQUIRED)
|
|
||||||
|
|
||||||
if (APPLE AND ${OPENSSL_INCLUDE_DIR} STREQUAL "/usr/include")
|
|
||||||
# this is a user on OS X using system OpenSSL, which is going to throw warnings since they're deprecating for their common crypto
|
|
||||||
message(WARNING "The found version of OpenSSL is the OS X system version. This will produce deprecation warnings."
|
|
||||||
"\nWe recommend you install a newer version (at least 1.0.1h) in a different directory and set OPENSSL_ROOT_DIR in your env so Cmake can find it.")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
|
|
||||||
|
|
||||||
# append OpenSSL to our list of libraries to link
|
|
||||||
target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
|
|
||||||
|
|
||||||
include_dependency_includes()
|
include_dependency_includes()
|
|
@ -27,8 +27,7 @@ IceServer::IceServer(int argc, char* argv[]) :
|
||||||
_id(QUuid::createUuid()),
|
_id(QUuid::createUuid()),
|
||||||
_serverSocket(),
|
_serverSocket(),
|
||||||
_activePeers(),
|
_activePeers(),
|
||||||
_httpManager(ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this),
|
_httpManager(ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this)
|
||||||
_httpsManager(NULL)
|
|
||||||
{
|
{
|
||||||
// start the ice-server socket
|
// start the ice-server socket
|
||||||
qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT;
|
qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT;
|
||||||
|
@ -195,7 +194,3 @@ bool IceServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, b
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IceServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl& url, bool skipSubHandler) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
|
@ -21,12 +21,11 @@
|
||||||
|
|
||||||
typedef QHash<QUuid, SharedNetworkPeer> NetworkPeerHash;
|
typedef QHash<QUuid, SharedNetworkPeer> NetworkPeerHash;
|
||||||
|
|
||||||
class IceServer : public QCoreApplication, public HTTPSRequestHandler {
|
class IceServer : public QCoreApplication, public HTTPRequestHandler {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
IceServer(int argc, char* argv[]);
|
IceServer(int argc, char* argv[]);
|
||||||
bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false);
|
bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false);
|
||||||
bool handleHTTPSRequest(HTTPSConnection* connection, const QUrl& url, bool skipSubHandler = false);
|
|
||||||
private slots:
|
private slots:
|
||||||
void processDatagrams();
|
void processDatagrams();
|
||||||
void clearInactivePeers();
|
void clearInactivePeers();
|
||||||
|
@ -39,7 +38,6 @@ private:
|
||||||
NetworkPeerHash _activePeers;
|
NetworkPeerHash _activePeers;
|
||||||
QHash<QUuid, QSet<QUuid> > _currentConnections;
|
QHash<QUuid, QSet<QUuid> > _currentConnections;
|
||||||
HTTPManager _httpManager;
|
HTTPManager _httpManager;
|
||||||
HTTPSManager* _httpsManager;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // hifi_IceServer_h
|
#endif // hifi_IceServer_h
|
Loading…
Reference in a new issue