From c23828a1fa478f958eaed3a5dd4e08d72ab5c5d8 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 13 Feb 2018 20:12:54 +0100 Subject: [PATCH] Revert "Web API: removed call to init() on generated Swagger objects as this is now handled automatically at construction time. Suppresses memory leaks." This reverts commit aa796c30b66e28536fb9b95c7f1d0e10dbe33fbf. --- sdrgui/webapi/webapiadaptergui.cpp | 52 +++++++++++++++++++++++++++++ sdrsrv/webapi/webapiadaptersrv.cpp | 53 ++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/sdrgui/webapi/webapiadaptergui.cpp b/sdrgui/webapi/webapiadaptergui.cpp index 267c40749..016d7b0c6 100644 --- a/sdrgui/webapi/webapiadaptergui.cpp +++ b/sdrgui/webapi/webapiadaptergui.cpp @@ -85,6 +85,7 @@ int WebAPIAdapterGUI::instanceSummary( #endif SWGSDRangel::SWGLoggingInfo *logging = response.getLogging(); + logging->init(); logging->setDumpToFile(m_mainWindow.m_logger->getUseFileLogger() ? 1 : 0); if (logging->getDumpToFile()) { @@ -204,6 +205,7 @@ int WebAPIAdapterGUI::instanceLoggingPut( m_mainWindow.setLoggingOptions(); // build response + response.init(); getMsgTypeString(m_mainWindow.m_settings.getConsoleMinLogLevel(), *response.getConsoleLevel()); response.setDumpToFile(m_mainWindow.m_settings.getUseLogFile() ? 1 : 0); getMsgTypeString(m_mainWindow.m_settings.getFileMinLogLevel(), *response.getFileLevel()); @@ -221,6 +223,7 @@ int WebAPIAdapterGUI::instanceAudioGet( int nbInputDevices = audioInputDevices.size(); int nbOutputDevices = audioOutputDevices.size(); + response.init(); response.setNbInputDevices(nbInputDevices); response.setInputDeviceSelectedIndex(m_mainWindow.m_audioDeviceInfo.getInputDeviceIndex()); response.setNbOutputDevices(nbOutputDevices); @@ -313,6 +316,7 @@ int WebAPIAdapterGUI::instanceDVSerialPatch( { m_mainWindow.m_dspEngine->setDVSerialSupport(dvserial); m_mainWindow.ui->action_DV_Serial->setChecked(dvserial); + response.init(); if (dvserial) { @@ -347,6 +351,7 @@ int WebAPIAdapterGUI::instancePresetsGet( int nbGroups = 0; int nbPresetsThisGroup = 0; QString groupName; + response.init(); QList *groups = response.getGroups(); QList *swgPresets = 0; int i = 0; @@ -361,6 +366,7 @@ int WebAPIAdapterGUI::instancePresetsGet( { if (i > 0) { groups->back()->setNbPresets(nbPresetsThisGroup); } groups->append(new SWGSDRangel::SWGPresetGroup); + groups->back()->init(); groupName = preset->getGroup(); *groups->back()->getGroupName() = groupName; swgPresets = groups->back()->getPresets(); @@ -426,6 +432,7 @@ int WebAPIAdapterGUI::instancePresetPatch( MainWindow::MsgLoadPreset *msg = MainWindow::MsgLoadPreset::create(selectedPreset, deviceSetIndex); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); response.setCenterFrequency(selectedPreset->getCenterFrequency()); *response.getGroupName() = selectedPreset->getGroup(); *response.getType() = selectedPreset->isSourcePreset() ? "R" : "T"; @@ -481,6 +488,7 @@ int WebAPIAdapterGUI::instancePresetPut( MainWindow::MsgSavePreset *msg = MainWindow::MsgSavePreset::create(const_cast(selectedPreset), deviceSetIndex, false); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); response.setCenterFrequency(selectedPreset->getCenterFrequency()); *response.getGroupName() = selectedPreset->getGroup(); *response.getType() = selectedPreset->isSourcePreset() ? "R" : "T"; @@ -524,6 +532,7 @@ int WebAPIAdapterGUI::instancePresetPost( MainWindow::MsgSavePreset *msg = MainWindow::MsgSavePreset::create(const_cast(selectedPreset), deviceSetIndex, true); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); response.setCenterFrequency(selectedPreset->getCenterFrequency()); *response.getGroupName() = selectedPreset->getGroup(); *response.getType() = selectedPreset->isSourcePreset() ? "R" : "T"; @@ -576,6 +585,7 @@ int WebAPIAdapterGUI::instanceDeviceSetPost( MainWindow::MsgAddDeviceSet *msg = MainWindow::MsgAddDeviceSet::create(tx); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to add a new device set (MsgAddDeviceSet) was submitted successfully"); return 202; @@ -590,12 +600,14 @@ int WebAPIAdapterGUI::instanceDeviceSetDelete( MainWindow::MsgRemoveLastDeviceSet *msg = MainWindow::MsgRemoveLastDeviceSet::create(); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to remove last device set (MsgRemoveLastDeviceSet) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = "No more device sets to be removed"; return 404; @@ -616,6 +628,7 @@ int WebAPIAdapterGUI::devicesetGet( } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -632,12 +645,14 @@ int WebAPIAdapterGUI::devicesetFocusPatch( MainWindow::MsgDeviceSetFocus *msg = MainWindow::MsgDeviceSetFocus::create(deviceSetIndex); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to focus on device set (MsgDeviceSetFocus) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -695,6 +710,7 @@ int WebAPIAdapterGUI::devicesetDevicePut( MainWindow::MsgSetDevice *msg = MainWindow::MsgSetDevice::create(deviceSetIndex, i, response.getTx() != 0); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); *response.getDisplayedName() = samplingDevice.displayedName; *response.getHwType() = samplingDevice.hardwareId; *response.getSerial() = samplingDevice.serial; @@ -713,6 +729,7 @@ int WebAPIAdapterGUI::devicesetDevicePut( } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -744,12 +761,14 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsGet( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -805,12 +824,14 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -838,12 +859,14 @@ int WebAPIAdapterGUI::devicesetDeviceRunGet( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -871,12 +894,14 @@ int WebAPIAdapterGUI::devicesetDeviceRunPost( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -904,12 +929,14 @@ int WebAPIAdapterGUI::devicesetDeviceRunDelete( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -930,6 +957,7 @@ int WebAPIAdapterGUI::devicesetChannelPost( { if (deviceSet->m_deviceSourceEngine == 0) { + error.init(); *error.getMessage() = QString("Device set at %1 is not a receive device set").arg(deviceSetIndex); return 400; } @@ -949,12 +977,14 @@ int WebAPIAdapterGUI::devicesetChannelPost( MainWindow::MsgAddChannel *msg = MainWindow::MsgAddChannel::create(deviceSetIndex, index, false); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to add a channel (MsgAddChannel) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = QString("There is no receive channel with id %1").arg(*query.getChannelType()); return 404; } @@ -963,6 +993,7 @@ int WebAPIAdapterGUI::devicesetChannelPost( { if (deviceSet->m_deviceSinkEngine == 0) { + error.init(); *error.getMessage() = QString("Device set at %1 is not a transmit device set").arg(deviceSetIndex); return 400; } @@ -982,12 +1013,14 @@ int WebAPIAdapterGUI::devicesetChannelPost( MainWindow::MsgAddChannel *msg = MainWindow::MsgAddChannel::create(deviceSetIndex, index, true); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to add a channel (MsgAddChannel) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = QString("There is no transmit channel with id %1").arg(*query.getChannelType()); return 404; } @@ -995,6 +1028,7 @@ int WebAPIAdapterGUI::devicesetChannelPost( } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; } @@ -1017,12 +1051,14 @@ int WebAPIAdapterGUI::devicesetChannelDelete( MainWindow::MsgDeleteChannel *msg = MainWindow::MsgDeleteChannel::create(deviceSetIndex, channelIndex, false); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to delete a channel (MsgDeleteChannel) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = QString("There is no channel at index %1. There are %2 Rx channels") .arg(channelIndex) .arg(channelIndex < deviceSet->getNumberOfRxChannels()); @@ -1036,12 +1072,14 @@ int WebAPIAdapterGUI::devicesetChannelDelete( MainWindow::MsgDeleteChannel *msg = MainWindow::MsgDeleteChannel::create(deviceSetIndex, channelIndex, true); m_mainWindow.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to delete a channel (MsgDeleteChannel) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = QString("There is no channel at index %1. There are %2 Tx channels") .arg(channelIndex) .arg(channelIndex < deviceSet->getNumberOfRxChannels()); @@ -1050,12 +1088,14 @@ int WebAPIAdapterGUI::devicesetChannelDelete( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; } @@ -1077,6 +1117,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsGet( if (channelAPI == 0) { + error.init(); *error.getMessage() = QString("There is no channel with index %1").arg(channelIndex); return 404; } @@ -1094,6 +1135,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsGet( if (channelAPI == 0) { + error.init(); *error.getMessage() = QString("There is no channel with index %1").arg(channelIndex); return 404; } @@ -1107,12 +1149,14 @@ int WebAPIAdapterGUI::devicesetChannelSettingsGet( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; } @@ -1136,6 +1180,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch( if (channelAPI == 0) { + error.init(); *error.getMessage() = QString("There is no channel with index %1").arg(channelIndex); return 404; } @@ -1150,6 +1195,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch( } else { + error.init(); *error.getMessage() = QString("There is no channel type %1 at index %2. Found %3.") .arg(*response.getChannelType()) .arg(channelIndex) @@ -1164,6 +1210,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch( if (channelAPI == 0) { + error.init(); *error.getMessage() = QString("There is no channel with index %1").arg(channelIndex); return 404; } @@ -1178,6 +1225,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch( } else { + error.init(); *error.getMessage() = QString("There is no channel type %1 at index %2. Found %3.") .arg(*response.getChannelType()) .arg(channelIndex) @@ -1188,12 +1236,14 @@ int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -1203,6 +1253,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch( void WebAPIAdapterGUI::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList) { + deviceSetList->init(); deviceSetList->setDevicesetcount((int) m_mainWindow.m_deviceUIs.size()); if (m_mainWindow.m_deviceUIs.size() > 0) { @@ -1223,6 +1274,7 @@ void WebAPIAdapterGUI::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSet void WebAPIAdapterGUI::getDeviceSet(SWGSDRangel::SWGDeviceSet *deviceSet, const DeviceUISet* deviceUISet, int deviceUISetIndex) { SWGSDRangel::SWGSamplingDevice *samplingDevice = deviceSet->getSamplingDevice(); + samplingDevice->init(); samplingDevice->setIndex(deviceUISetIndex); samplingDevice->setTx(deviceUISet->m_deviceSinkEngine != 0); diff --git a/sdrsrv/webapi/webapiadaptersrv.cpp b/sdrsrv/webapi/webapiadaptersrv.cpp index fd2984a8a..cbffcdad6 100644 --- a/sdrsrv/webapi/webapiadaptersrv.cpp +++ b/sdrsrv/webapi/webapiadaptersrv.cpp @@ -81,6 +81,7 @@ int WebAPIAdapterSrv::instanceSummary( #endif SWGSDRangel::SWGLoggingInfo *logging = response.getLogging(); + logging->init(); logging->setDumpToFile(m_mainCore.m_logger->getUseFileLogger() ? 1 : 0); if (logging->getDumpToFile()) { @@ -103,6 +104,7 @@ int WebAPIAdapterSrv::instanceDelete( MainCore::MsgDeleteInstance *msg = MainCore::MsgDeleteInstance::create(); m_mainCore.getInputMessageQueue()->push(msg); + response.init(); *response.getMessage() = QString("Message to stop the SDRangel instance (MsgDeleteInstance) was submitted successfully"); return 202; @@ -204,6 +206,7 @@ int WebAPIAdapterSrv::instanceLoggingPut( m_mainCore.setLoggingOptions(); // build response + response.init(); getMsgTypeString(m_mainCore.m_settings.getConsoleMinLogLevel(), *response.getConsoleLevel()); response.setDumpToFile(m_mainCore.m_settings.getUseLogFile() ? 1 : 0); getMsgTypeString(m_mainCore.m_settings.getFileMinLogLevel(), *response.getFileLevel()); @@ -221,6 +224,7 @@ int WebAPIAdapterSrv::instanceAudioGet( int nbInputDevices = audioInputDevices.size(); int nbOutputDevices = audioOutputDevices.size(); + response.init(); response.setNbInputDevices(nbInputDevices); response.setInputDeviceSelectedIndex(m_mainCore.m_audioDeviceInfo.getInputDeviceIndex()); response.setNbOutputDevices(nbOutputDevices); @@ -312,6 +316,7 @@ int WebAPIAdapterSrv::instanceDVSerialPatch( SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) { m_mainCore.m_dspEngine->setDVSerialSupport(dvserial); + response.init(); if (dvserial) { @@ -367,6 +372,7 @@ int WebAPIAdapterSrv::instancePresetFilePut( preset->setDescription(*query.getDescription()); } + response.init(); response.setCenterFrequency(preset->getCenterFrequency()); *response.getGroupName() = preset->getGroup(); *response.getType() = preset->isSourcePreset() ? "R" : "T"; @@ -426,6 +432,7 @@ int WebAPIAdapterSrv::instancePresetFilePost( outstream << base64Str; exportFile.close(); + response.init(); response.setCenterFrequency(selectedPreset->getCenterFrequency()); *response.getGroupName() = selectedPreset->getGroup(); *response.getType() = selectedPreset->isSourcePreset() ? "R" : "T"; @@ -454,6 +461,7 @@ int WebAPIAdapterSrv::instancePresetsGet( int nbGroups = 0; int nbPresetsThisGroup = 0; QString groupName; + response.init(); QList *groups = response.getGroups(); QList *swgPresets = 0; int i = 0; @@ -468,6 +476,7 @@ int WebAPIAdapterSrv::instancePresetsGet( { if (i > 0) { groups->back()->setNbPresets(nbPresetsThisGroup); } groups->append(new SWGSDRangel::SWGPresetGroup); + groups->back()->init(); groupName = preset->getGroup(); *groups->back()->getGroupName() = groupName; swgPresets = groups->back()->getPresets(); @@ -533,6 +542,7 @@ int WebAPIAdapterSrv::instancePresetPatch( MainCore::MsgLoadPreset *msg = MainCore::MsgLoadPreset::create(selectedPreset, deviceSetIndex); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); response.setCenterFrequency(selectedPreset->getCenterFrequency()); *response.getGroupName() = selectedPreset->getGroup(); *response.getType() = selectedPreset->isSourcePreset() ? "R" : "T"; @@ -588,6 +598,7 @@ int WebAPIAdapterSrv::instancePresetPut( MainCore::MsgSavePreset *msg = MainCore::MsgSavePreset::create(const_cast(selectedPreset), deviceSetIndex, false); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); response.setCenterFrequency(selectedPreset->getCenterFrequency()); *response.getGroupName() = selectedPreset->getGroup(); *response.getType() = selectedPreset->isSourcePreset() ? "R" : "T"; @@ -643,6 +654,7 @@ int WebAPIAdapterSrv::instancePresetPost( MainCore::MsgSavePreset *msg = MainCore::MsgSavePreset::create(const_cast(selectedPreset), deviceSetIndex, true); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); response.setCenterFrequency(selectedPreset->getCenterFrequency()); *response.getGroupName() = selectedPreset->getGroup(); *response.getType() = selectedPreset->isSourcePreset() ? "R" : "T"; @@ -695,6 +707,7 @@ int WebAPIAdapterSrv::instanceDeviceSetPost( MainCore::MsgAddDeviceSet *msg = MainCore::MsgAddDeviceSet::create(tx); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to add a new device set (MsgAddDeviceSet) was submitted successfully"); return 202; @@ -709,12 +722,14 @@ int WebAPIAdapterSrv::instanceDeviceSetDelete( MainCore::MsgRemoveLastDeviceSet *msg = MainCore::MsgRemoveLastDeviceSet::create(); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to remove last device set (MsgRemoveLastDeviceSet) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = "No more device sets to be removed"; return 404; @@ -735,6 +750,7 @@ int WebAPIAdapterSrv::devicesetGet( } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -801,6 +817,7 @@ int WebAPIAdapterSrv::devicesetDevicePut( MainCore::MsgSetDevice *msg = MainCore::MsgSetDevice::create(deviceSetIndex, i, response.getTx() != 0); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); *response.getDisplayedName() = samplingDevice.displayedName; *response.getHwType() = samplingDevice.hardwareId; *response.getSerial() = samplingDevice.serial; @@ -819,6 +836,7 @@ int WebAPIAdapterSrv::devicesetDevicePut( } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -850,12 +868,14 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsGet( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; } @@ -910,12 +930,14 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsPutPatch( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; } @@ -942,12 +964,14 @@ int WebAPIAdapterSrv::devicesetDeviceRunGet( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -975,12 +999,14 @@ int WebAPIAdapterSrv::devicesetDeviceRunPost( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -1008,12 +1034,14 @@ int WebAPIAdapterSrv::devicesetDeviceRunDelete( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -1034,6 +1062,7 @@ int WebAPIAdapterSrv::devicesetChannelPost( { if (deviceSet->m_deviceSourceEngine == 0) { + error.init(); *error.getMessage() = QString("Device set at %1 is not a receive device set").arg(deviceSetIndex); return 400; } @@ -1053,12 +1082,14 @@ int WebAPIAdapterSrv::devicesetChannelPost( MainCore::MsgAddChannel *msg = MainCore::MsgAddChannel::create(deviceSetIndex, index, false); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to add a channel (MsgAddChannel) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = QString("There is no receive channel with id %1").arg(*query.getChannelType()); return 404; } @@ -1067,6 +1098,7 @@ int WebAPIAdapterSrv::devicesetChannelPost( { if (deviceSet->m_deviceSinkEngine == 0) { + error.init(); *error.getMessage() = QString("Device set at %1 is not a transmit device set").arg(deviceSetIndex); return 400; } @@ -1086,12 +1118,14 @@ int WebAPIAdapterSrv::devicesetChannelPost( MainCore::MsgAddChannel *msg = MainCore::MsgAddChannel::create(deviceSetIndex, index, true); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to add a channel (MsgAddChannel) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = QString("There is no transmit channel with id %1").arg(*query.getChannelType()); return 404; } @@ -1099,6 +1133,7 @@ int WebAPIAdapterSrv::devicesetChannelPost( } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; } @@ -1121,12 +1156,14 @@ int WebAPIAdapterSrv::devicesetChannelDelete( MainCore::MsgDeleteChannel *msg = MainCore::MsgDeleteChannel::create(deviceSetIndex, channelIndex, false); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to delete a channel (MsgDeleteChannel) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = QString("There is no channel at index %1. There are %2 Rx channels") .arg(channelIndex) .arg(channelIndex < deviceSet->getNumberOfRxChannels()); @@ -1140,12 +1177,14 @@ int WebAPIAdapterSrv::devicesetChannelDelete( MainCore::MsgDeleteChannel *msg = MainCore::MsgDeleteChannel::create(deviceSetIndex, channelIndex, true); m_mainCore.m_inputMessageQueue.push(msg); + response.init(); *response.getMessage() = QString("Message to delete a channel (MsgDeleteChannel) was submitted successfully"); return 202; } else { + error.init(); *error.getMessage() = QString("There is no channel at index %1. There are %2 Tx channels") .arg(channelIndex) .arg(channelIndex < deviceSet->getNumberOfRxChannels()); @@ -1154,12 +1193,14 @@ int WebAPIAdapterSrv::devicesetChannelDelete( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; } @@ -1181,6 +1222,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsGet( if (channelAPI == 0) { + error.init(); *error.getMessage() = QString("There is no channel with index %1").arg(channelIndex); return 404; } @@ -1198,6 +1240,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsGet( if (channelAPI == 0) { + error.init(); *error.getMessage() = QString("There is no channel with index %1").arg(channelIndex); return 404; } @@ -1211,12 +1254,14 @@ int WebAPIAdapterSrv::devicesetChannelSettingsGet( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; } @@ -1240,6 +1285,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsPutPatch( if (channelAPI == 0) { + error.init(); *error.getMessage() = QString("There is no channel with index %1").arg(channelIndex); return 404; } @@ -1254,6 +1300,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsPutPatch( } else { + error.init(); *error.getMessage() = QString("There is no channel type %1 at index %2. Found %3.") .arg(*response.getChannelType()) .arg(channelIndex) @@ -1268,6 +1315,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsPutPatch( if (channelAPI == 0) { + error.init(); *error.getMessage() = QString("There is no channel with index %1").arg(channelIndex); return 404; } @@ -1282,6 +1330,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsPutPatch( } else { + error.init(); *error.getMessage() = QString("There is no channel type %1 at index %2. Found %3.") .arg(*response.getChannelType()) .arg(channelIndex) @@ -1292,12 +1341,14 @@ int WebAPIAdapterSrv::devicesetChannelSettingsPutPatch( } else { + error.init(); *error.getMessage() = QString("DeviceSet error"); return 500; } } else { + error.init(); *error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex); return 404; @@ -1307,6 +1358,7 @@ int WebAPIAdapterSrv::devicesetChannelSettingsPutPatch( void WebAPIAdapterSrv::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList) { + deviceSetList->init(); deviceSetList->setDevicesetcount((int) m_mainCore.m_deviceSets.size()); std::vector::const_iterator it = m_mainCore.m_deviceSets.begin(); @@ -1323,6 +1375,7 @@ void WebAPIAdapterSrv::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSet void WebAPIAdapterSrv::getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, const DeviceSet* deviceSet, int deviceUISetIndex) { SWGSDRangel::SWGSamplingDevice *samplingDevice = swgDeviceSet->getSamplingDevice(); + samplingDevice->init(); samplingDevice->setIndex(deviceUISetIndex); samplingDevice->setTx(deviceSet->m_deviceSinkEngine != 0);