From 98dcc06a6a04b2562ccf2b6c44f25d1aef8dbb2f Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Fri, 29 Nov 2024 15:04:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=BE=D0=B3=D0=B3=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE?= =?UTF-8?q?=D0=BA=20API=20(=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/terminal_api_driver.cpp | 84 ++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index 7383d6e..610c1f7 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -450,14 +450,14 @@ public: #ifdef MODEM_IS_SCPC void setSettingsRxTx(modulator_settings& mod, demodulator_settings& demod, ACM_parameters_serv_& acm, bool readback = true) { std::lock_guard lock(this->cpApiMutex); - CP_SetDmaDebug(sid, "begin_save_config", ""); - CP_SetModulatorSettings(this->sid, mod); - CP_SetDemodulatorSettings(this->sid, demod); - CP_SetAcmParams(this->sid, acm); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_SetDmaDebug(begin_save_config)", CP_SetDmaDebug(sid, "begin_save_config", "")); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_SetModulatorSettings()", CP_SetModulatorSettings(this->sid, mod)); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_SetDemodulatorSettings()", CP_SetDemodulatorSettings(this->sid, demod)); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_SetAcmParams()", CP_SetAcmParams(this->sid, acm)); if (readback) { - CP_GetModulatorSettings(this->sid, mod); - CP_GetDemodulatorSettings(this->sid, demod); - CP_GetAcmParams(this->sid, &acm); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_GetModulatorSettings()", CP_GetModulatorSettings(this->sid, mod)); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_GetDemodulatorSettings()", CP_GetDemodulatorSettings(this->sid, demod)); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_GetAcmParams()", CP_GetAcmParams(this->sid, &acm)); { std::lock_guard lock2{this->settingsMutex}; this->modSettings = mod; @@ -465,71 +465,71 @@ public: this->acmSettings = acm; } } - CP_SetDmaDebug(sid, "save_config", ""); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_SetDmaDebug(save_config)", CP_SetDmaDebug(sid, "save_config", "")); } #else void setSettingsRxTx(modulator_settings& mod, demodulator_settings& demod, bool readback = true) { std::lock_guard lock(this->cpApiMutex); - CP_SetDmaDebug(sid, "begin_save_config", ""); - CP_SetModulatorSettings(this->sid, mod); - CP_SetDemodulatorSettings(this->sid, demod); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_SetDmaDebug(begin_save_config)", CP_SetDmaDebug(sid, "begin_save_config", "")); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_SetModulatorSettings()", CP_SetModulatorSettings(this->sid, mod)); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_SetDemodulatorSettings()", CP_SetDemodulatorSettings(this->sid, demod)); if (readback) { - CP_GetModulatorSettings(this->sid, mod); - CP_GetDemodulatorSettings(this->sid, demod); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_GetModulatorSettings()", CP_GetModulatorSettings(this->sid, mod)); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_GetDemodulatorSettings()", CP_GetDemodulatorSettings(this->sid, demod)); { std::lock_guard lock2{this->settingsMutex}; this->modSettings = mod; this->demodSettings = demod; } } - CP_SetDmaDebug(sid, "save_config", ""); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsRxTx()->CP_SetDmaDebug(save_config)", CP_SetDmaDebug(sid, "save_config", "")); } #endif #ifdef MODEM_IS_SCPC void setSettingsCinc(DPDI_parmeters& s, bool readback = true) { std::lock_guard lock(this->cpApiMutex); - CP_SetDmaDebug(sid, "begin_save_config", ""); - CP_SetDpdiParams(sid, s); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsCinc()->CP_SetDmaDebug(begin_save_config)", CP_SetDmaDebug(sid, "begin_save_config", "")); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsCinc()->CP_SetDpdiParams()", CP_SetDpdiParams(sid, s))); if (readback) { - CP_GetDpdiParams(this->sid, &s); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsCinc()->CP_GetDpdiParams()", CP_GetDpdiParams(this->sid, &s)); { std::lock_guard lock2{this->settingsMutex}; this->dpdiSettings = s; } } - CP_SetDmaDebug(sid, "save_config", ""); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsCinc()->CP_SetDmaDebug(save_config)", CP_SetDmaDebug(sid, "save_config", "")); } #endif void setSettingsBucLnb(buc_lnb_settings& bucLnb, bool readback = true) { std::lock_guard lock(this->cpApiMutex); - CP_SetDmaDebug(sid, "begin_save_config", ""); - CP_SetBUC_LNB_settings(this->sid, bucLnb); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsBucLnb()->CP_SetDmaDebug(begin_save_config)", CP_SetDmaDebug(sid, "begin_save_config", "")); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsBucLnb()->CP_SetBUC_LNB_settings()", CP_SetBUC_LNB_settings(this->sid, bucLnb)); if (readback) { - CP_GetBUC_LNB_settings(this->sid, bucLnb); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsBucLnb()->CP_GetBUC_LNB_settings()", CP_GetBUC_LNB_settings(this->sid, bucLnb)); { std::lock_guard lock2{this->settingsMutex}; this->bucLnbSettings = bucLnb; } } - CP_SetDmaDebug(sid, "save_config", ""); + logCpApiError("api_driver::TerminalApiDaemon::setSettingsBucLnb()->CP_SetDmaDebug(save_config)", CP_SetDmaDebug(sid, "save_config", "")); } void setQosSettings(bool enabled, const std::string& str, bool readback = true) { std::lock_guard lock(this->cpApiMutex); - CP_SetDmaDebug(sid, "begin_save_config", ""); - CP_SetQoSSettings(this->sid, str, enabled); + logCpApiError("api_driver::TerminalApiDaemon::setQosSettings()->CP_SetDmaDebug()", CP_SetDmaDebug(sid, "begin_save_config", "")); + logCpApiError("api_driver::TerminalApiDaemon::setQosSettings()->CP_SetQoSSettings()", CP_SetQoSSettings(this->sid, str, enabled)); if (readback) { bool tmp1; std::string tmp2; - CP_GetQoSSettings(this->sid, tmp2, tmp1); + logCpApiError("api_driver::TerminalApiDaemon::setQosSettings()->CP_GetQoSSettings()", CP_GetQoSSettings(this->sid, tmp2, tmp1)); { std::lock_guard lock2(this->qosSettingsMutex); this->qosEnabled = tmp1; this->qosClassesJson = tmp2.empty() ? DEFAULT_QOS_CLASSES : tmp2; } } - CP_SetDmaDebug(sid, "save_config", ""); + logCpApiError("api_driver::TerminalApiDaemon::setQosSettings()->CP_SetDmaDebug()", CP_SetDmaDebug(sid, "save_config", "")); } void setNetworkSettings(TerminalNetworkSettings& s, bool readback = true) { @@ -541,13 +541,13 @@ public: else { throw std::runtime_error("invalid mode"); } std::lock_guard lock(this->cpApiMutex); - CP_SetDmaDebug(sid, "begin_save_config", ""); - CP_SetNetwork(sid, "mode", isL2 ? "tap" : "tun"); - CP_SetNetwork(sid, "addr", mang.first.c_str()); - CP_SetNetwork(sid, "mask", mang.second.c_str()); - CP_SetNetwork(sid, "gateway", s.managementGateway.c_str()); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_SetDmaDebug(begin_save_config)", CP_SetDmaDebug(sid, "begin_save_config", "")); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_SetNetwork(mode)", CP_SetNetwork(sid, "mode", isL2 ? "tap" : "tun")); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_SetNetwork(addr)", CP_SetNetwork(sid, "addr", mang.first.c_str())); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_SetNetwork(mask)", CP_SetNetwork(sid, "mask", mang.second.c_str())); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_SetNetwork(gateway)", CP_SetNetwork(sid, "gateway", s.managementGateway.c_str())); if (!isL2) { - CP_SetNetwork(sid, "data_addr", data.first.c_str()); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_SetNetwork(data_addr)", CP_SetNetwork(sid, "data_addr", data.first.c_str())); // TODO маска не устанавливается, потому что в API этого нет } // TODO MTU не устанавливается, потому что в API этого нет @@ -556,15 +556,15 @@ public: std::string tmp; s.loadDefaults(); s.managementIp.clear(); - CP_GetNetwork(sid, "addr", &s.managementIp); - CP_GetNetwork(sid, "mask", &tmp); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_GetNetwork(addr)", CP_GetNetwork(sid, "addr", &s.managementIp)); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_GetNetwork(mask)", CP_GetNetwork(sid, "mask", &tmp)); s.managementIp += "/"; s.managementIp += std::to_string(calculateSubnetMask(tmp)); - CP_GetNetwork(sid, "gateway", &s.managementGateway); - tmp.clear(); CP_GetNetwork(sid, "mode", &tmp); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_GetNetwork(gateway)", CP_GetNetwork(sid, "gateway", &s.managementGateway)); + tmp.clear(); logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_GetNetwork(mode)", CP_GetNetwork(sid, "mode", &tmp)); if (tmp == "tun") { s.mode = "l3"; - CP_GetNetwork(sid, "addr_data", &s.dataIp); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_GetNetwork(addr_data)", CP_GetNetwork(sid, "addr_data", &s.dataIp)); } else { s.mode = "l2"; s.dataIp = "0.0.0.0/24"; @@ -575,20 +575,20 @@ public: this->networkSettings = s; } } - CP_SetDmaDebug(sid, "save_config", ""); + logCpApiError("api_driver::TerminalApiDaemon::setNetworkSettings()->CP_SetDmaDebug(save_config)", CP_SetDmaDebug(sid, "save_config", "")); } void resetPacketStatistics() { std::string tmp; std::lock_guard lock(this->cpApiMutex); - CP_GetDmaDebug(sid, "reset_cnt_rx", &tmp); + logCpApiError("api_driver::TerminalApiDaemon::resetPacketStatistics()->CP_GetDmaDebug(reset_cnt_rx)", CP_GetDmaDebug(sid, "reset_cnt_rx", &tmp)); } void resetDefaultSettings() { std::lock_guard lock(this->cpApiMutex); - CP_SetDmaDebug(sid, "begin_save_config", " "); - CP_SetDmaDebug(sid, "default_params", ""); - CP_SetDmaDebug(sid, "save_config", " "); + logCpApiError("api_driver::TerminalApiDaemon::resetDefaultSettings()->CP_SetDmaDebug(begin_save_config)", CP_SetDmaDebug(sid, "begin_save_config", "")); + logCpApiError("api_driver::TerminalApiDaemon::resetDefaultSettings()->CP_SetDmaDebug(default_params)", CP_SetDmaDebug(sid, "default_params", "")); + logCpApiError("api_driver::TerminalApiDaemon::resetDefaultSettings()->CP_SetDmaDebug(save_config)", CP_SetDmaDebug(sid, "save_config", "")); } ~TerminalApiDaemon() {