Browse Source

mainserver: Handle unavailable default sampling devices

Check default File Input, File Output, and Test MIMO device
indices before using them when creating or changing devices.
Log a warning and return if a device is unavailable, avoiding
invalid indices and improving server runtime robustness.

Coverity CIDs: 652143, 652186, 652269 and more.

Signed-off-by: Robin Getz <rgetz503@gmail.com>
chirpmodem-v8.1.0
Robin Getz 4 weeks ago
parent
commit
a10fb3a500
No known key found for this signature in database
GPG Key ID: 51C7231FFED0E060
  1. 24
      sdrsrv/mainserver.cpp

24
sdrsrv/mainserver.cpp

@ -285,6 +285,10 @@ void MainServer::addSinkDevice() @@ -285,6 +285,10 @@ void MainServer::addSinkDevice()
// create a file sink by default
int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
if (fileSinkDeviceIndex < 0) {
qWarning("MainServer::addSinkDevice: File Output is not available");
return;
}
const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
@ -324,6 +328,10 @@ void MainServer::addSourceDevice() @@ -324,6 +328,10 @@ void MainServer::addSourceDevice()
// Create a file source instance by default
int fileSourceDeviceIndex = DeviceEnumerator::instance()->getFileInputDeviceIndex();
if (fileSourceDeviceIndex < 0) {
qWarning("MainServer::addSourceDevice: File Input device is not available");
return;
}
const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(fileSourceDeviceIndex);
deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
@ -361,6 +369,10 @@ void MainServer::addMIMODevice() @@ -361,6 +369,10 @@ void MainServer::addMIMODevice()
// create a test MIMO by default
int testMIMODeviceIndex = DeviceEnumerator::instance()->getTestMIMODeviceIndex();
if (testMIMODeviceIndex < 0) {
qWarning("MainServer::addMIMODevice: Test MIMO device is not available");
return;
}
const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(testMIMODeviceIndex);
deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
@ -463,6 +475,10 @@ void MainServer::changeSampleSource(int deviceSetIndex, int selectedDeviceIndex) @@ -463,6 +475,10 @@ void MainServer::changeSampleSource(int deviceSetIndex, int selectedDeviceIndex)
{
qDebug("MainServer::changeSampleSource: non existent device replaced by File Input");
int deviceIndex = DeviceEnumerator::instance()->getFileInputDeviceIndex();
if (deviceIndex < 0) {
qWarning("MainServer::changeSampleSource: File Input is not available");
return;
}
samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex);
deviceSet->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
deviceSet->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
@ -543,6 +559,10 @@ void MainServer::changeSampleSink(int deviceSetIndex, int selectedDeviceIndex) @@ -543,6 +559,10 @@ void MainServer::changeSampleSink(int deviceSetIndex, int selectedDeviceIndex)
{
qDebug("MainServer::changeSampleSink: non existent device replaced by File Sink");
int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
if (fileSinkDeviceIndex < 0) {
qWarning("MainServer::changeSampleSink: File Sink is not available");
return;
}
samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
deviceSet->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
deviceSet->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
@ -622,6 +642,10 @@ void MainServer::changeSampleMIMO(int deviceSetIndex, int selectedDeviceIndex) @@ -622,6 +642,10 @@ void MainServer::changeSampleMIMO(int deviceSetIndex, int selectedDeviceIndex)
{
qDebug("MainServer::changeSampleMIMO: non existent device replaced by Test MIMO");
int testMIMODeviceIndex = DeviceEnumerator::instance()->getTestMIMODeviceIndex();
if (testMIMODeviceIndex < 0) {
qWarning("MainServer::changeSampleMIMO: Test MIMO device is not available");
return;
}
samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(testMIMODeviceIndex);
deviceSet->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
deviceSet->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);

Loading…
Cancel
Save