VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-04 22:27:53 -04:00
Code Issues Projects Releases Wiki Activity

websocket spectrum: added listening address and port to websocket spectrum server information. Fixed setting of listening address

Browse Source
This commit is contained in:
f4exb 2020-05-06 17:01:59 +02:00
parent 270fd955ae
commit 358f1ea2f0
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sdrbase/dsp/spectrumvis.cpp
View File

@ -774,11 +774,12 @@ void SpectrumVis::handleWSOpenClose(bool openClose)
void SpectrumVis::handleConfigureWSSpectrum(const QString& address, uint16_t port) void SpectrumVis::handleConfigureWSSpectrum(const QString& address, uint16_t port)
{ {
m_wsSpectrum.setListeningAddress(address);
m_wsSpectrum.setPort(port);
if (m_wsSpectrum.socketOpened()) if (m_wsSpectrum.socketOpened())
{ {
m_wsSpectrum.closeSocket(); m_wsSpectrum.closeSocket();
m_wsSpectrum.setListeningAddress(address);
m_wsSpectrum.setPort(port);
m_wsSpectrum.openSocket(); m_wsSpectrum.openSocket();
} }
} }
@ -824,6 +825,18 @@ int SpectrumVis::webapiSpectrumServerGet(SWGSDRangel::SWGSpectrumServer& respons
response.init(); response.init();
response.setRun(serverRunning ? 1 : 0); response.setRun(serverRunning ? 1 : 0);
QHostAddress serverAddress = m_wsSpectrum.getListeningAddress();
if (serverAddress != QHostAddress::Null) {
response.setListeningAddress(new QString(serverAddress.toString()));
}
uint16_t serverPort = m_wsSpectrum.getListeningPort();
if (serverPort != 0) {
response.setListeningPort(serverPort);
}
if (peerHosts.size() > 0) if (peerHosts.size() > 0)
{ {
response.setClients(new QList<SWGSDRangel::SWGSpectrumServer_clients*>); response.setClients(new QList<SWGSDRangel::SWGSpectrumServer_clients*>);

18
sdrbase/websockets/wsspectrum.cpp
View File

@ -124,6 +124,24 @@ void WSSpectrum::socketDisconnected()
} }
} }
QHostAddress WSSpectrum::getListeningAddress() const
{
if (m_webSocketServer) {
return m_webSocketServer->serverAddress();
} else {
return QHostAddress::Null;
}
}
uint16_t WSSpectrum::getListeningPort() const
{
if (m_webSocketServer) {
return m_webSocketServer->serverPort();
} else {
return 0;
}
}
void WSSpectrum::newSpectrum( void WSSpectrum::newSpectrum(
const std::vector<Real>& spectrum, const std::vector<Real>& spectrum,
int fftSize, int fftSize,

2
sdrbase/websockets/wsspectrum.h
View File

@ -45,6 +45,8 @@ public:
void getPeers(QList<QHostAddress>& hosts, QList<quint16>& ports) const; void getPeers(QList<QHostAddress>& hosts, QList<quint16>& ports) const;
void setListeningAddress(const QString& address) { m_listeningAddress.setAddress(address); } void setListeningAddress(const QString& address) { m_listeningAddress.setAddress(address); }
void setPort(quint16 port) { m_port = port; } void setPort(quint16 port) { m_port = port; }
QHostAddress getListeningAddress() const;
uint16_t getListeningPort() const;
void newSpectrum( void newSpectrum(
const std::vector<Real>& spectrum, const std::vector<Real>& spectrum,
int fftSize, int fftSize,