VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-28 21:12:26 -04:00
Code Issues Projects Releases Wiki Activity

Support compilation without SSL support.

Browse Source
This commit is contained in:
srcejon 2024-11-06 12:12:46 +00:00
parent 8ed7972dce
commit 14063a80e9
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp
View File

@ -150,6 +150,7 @@ void RemoteTCPInputTCPHandler::connectToHost(const QString& address, quint16 por
m_readMetaData = false; m_readMetaData = false;
if (protocol == "SDRangel wss") if (protocol == "SDRangel wss")
{ {
#ifndef QT_NO_OPENSSL
m_webSocket = new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this); m_webSocket = new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this);
connect(m_webSocket, &QWebSocket::binaryFrameReceived, this, &RemoteTCPInputTCPHandler::dataReadyRead); connect(m_webSocket, &QWebSocket::binaryFrameReceived, this, &RemoteTCPInputTCPHandler::dataReadyRead);
connect(m_webSocket, &QWebSocket::connected, this, &RemoteTCPInputTCPHandler::connected); connect(m_webSocket, &QWebSocket::connected, this, &RemoteTCPInputTCPHandler::connected);
@ -160,6 +161,9 @@ void RemoteTCPInputTCPHandler::connectToHost(const QString& address, quint16 por
connect(m_webSocket, &QWebSocket::sslErrors, this, &RemoteTCPInputTCPHandler::sslErrors); connect(m_webSocket, &QWebSocket::sslErrors, this, &RemoteTCPInputTCPHandler::sslErrors);
m_webSocket->open(QUrl(QString("wss://%1:%2").arg(address).arg(port))); m_webSocket->open(QUrl(QString("wss://%1:%2").arg(address).arg(port)));
m_dataSocket = new WebSocket(m_webSocket); m_dataSocket = new WebSocket(m_webSocket);
#else
qWarning() << "RemoteTCPInput unable to use wss protocol as SSL is not supported";
#endif
} }
else else
{ {
@ -202,6 +206,7 @@ void RemoteTCPInputTCPHandler::cleanup()
FLAC__stream_decoder_delete(m_decoder); FLAC__stream_decoder_delete(m_decoder);
m_decoder = nullptr; m_decoder = nullptr;
} }
#ifndef QT_NO_OPENSSL
if (m_webSocket) if (m_webSocket)
{ {
qDebug() << "RemoteTCPInputTCPHandler::cleanup: Closing and deleting web socket"; qDebug() << "RemoteTCPInputTCPHandler::cleanup: Closing and deleting web socket";
@ -212,6 +217,7 @@ void RemoteTCPInputTCPHandler::cleanup()
disconnect(m_webSocket, &QWebSocket::errorOccurred, this, &RemoteTCPInputTCPHandler::errorOccurred); disconnect(m_webSocket, &QWebSocket::errorOccurred, this, &RemoteTCPInputTCPHandler::errorOccurred);
#endif #endif
} }
#endif
if (m_tcpSocket) if (m_tcpSocket)
{ {
qDebug() << "RemoteTCPInputTCPHandler::cleanup: Closing and deleting TCP socket"; qDebug() << "RemoteTCPInputTCPHandler::cleanup: Closing and deleting TCP socket";
@ -1071,11 +1077,13 @@ void RemoteTCPInputTCPHandler::errorOccurred(QAbstractSocket::SocketError socket
} }
} }
#ifndef QT_NO_OPENSSL
void RemoteTCPInputTCPHandler::sslErrors(const QList<QSslError> &errors) void RemoteTCPInputTCPHandler::sslErrors(const QList<QSslError> &errors)
{ {
qDebug() << "RemoteTCPInputTCPHandler::sslErrors: " << errors; qDebug() << "RemoteTCPInputTCPHandler::sslErrors: " << errors;
m_webSocket->ignoreSslErrors(); // FIXME: Add a setting whether to do this? m_webSocket->ignoreSslErrors(); // FIXME: Add a setting whether to do this?
} }
#endif
void RemoteTCPInputTCPHandler::dataReadyRead() void RemoteTCPInputTCPHandler::dataReadyRead()
{ {

2
plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.h
View File

@ -187,7 +187,9 @@ public slots:
void connected(); void connected();
void disconnected(); void disconnected();
void errorOccurred(QAbstractSocket::SocketError socketError); void errorOccurred(QAbstractSocket::SocketError socketError);
#ifndef QT_NO_OPENSSL
void sslErrors(const QList<QSslError> &errors); void sslErrors(const QList<QSslError> &errors);
#endif
private: private: