VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: VladislavOstapov:55448c2bfead7ddf5f639fff787e032b50d04b45
Branches Tags
VladislavOstapov:master
VladislavOstapov:v1.1-stable
..
compare: VladislavOstapov:cc354b73e3e95215e45eea2b28662f100d235fdc
Branches Tags
VladislavOstapov:master
VladislavOstapov:v1.1-stable

No commits in common. "55448c2bfead7ddf5f639fff787e032b50d04b45" and "cc354b73e3e95215e45eea2b28662f100d235fdc" have entirely different histories.
55448c2bfe ... cc354b73e3

4 changed files with 10 additions and 25 deletions
Show Stats Expand all files Collapse all files

8
src/main.cpp
View File

@ -95,12 +95,8 @@ class ServerResources {
}
}
void doTerminalUpgrade() const {
api->executeInApi([](TSID sid) {
CP_SetDmaDebug(sid, "begin_save_config", "");
system(UPGRADE_COMMAND);
CP_SetDmaDebug(sid, "save_config", "");
});
static void doTerminalUpgrade() {
system(UPGRADE_COMMAND);
}
public:

17
src/terminal_api_driver.cpp
View File

@ -100,6 +100,8 @@ public:
*/
class api_driver::TerminalApiDaemon {
private:
TSID sid;
boost::thread daemon;
void updateFirmwareSettings() {
std::string version, chip_id, sn, mac0, mac1;
@ -284,6 +286,8 @@ private:
}
}
std::mutex cpApiMutex;
std::shared_mutex firmwareMutex;
TerminalFirmwareVersion firmware;
@ -307,10 +311,6 @@ private:
std::string qosClassesJson;
public:
std::mutex cpApiMutex;
TSID sid;
boost::thread daemon;
explicit TerminalApiDaemon(TSID sid): sid(sid), daemon([this]() { this->run(); }), qosEnabled(false) {
this->qosClassesJson = DEFAULT_QOS_CLASSES;
}
@ -892,15 +892,6 @@ void api_driver::ApiDriver::resetDefaultSettings() {
daemon->resetDefaultSettings();
}
void api_driver::ApiDriver::executeInApi(const std::function<void(TSID sid)>& callback) {
try {
std::lock_guard lock(this->daemon->cpApiMutex);
callback(this->daemon->sid);
} catch (std::exception& e) {
BOOST_LOG_TRIVIAL(error) << "ApiDriver::executeInApi(): failed to exec with error: " << e.what();
}
}
bool api_driver::ApiDriver::getIsCinC() const {
modulator_settings s{};
daemon->getSettings(&s, nullptr, nullptr, nullptr, nullptr);

2
src/terminal_api_driver.h
View File

@ -67,8 +67,6 @@ namespace api_driver {
void resetDefaultSettings();
void executeInApi(const std::function<void(TSID sid)>& callback);
~ApiDriver();
private:

8
static/main.html
View File

@ -1183,8 +1183,8 @@
}
if (qc['filters'][fi].sport !== "") { filter['sport'] = qc['filters'][fi].sport }
if (qc['filters'][fi].dport !== "") { filter['dport'] = qc['filters'][fi].dport }
if (qc['filters'][fi].ip_src !== "") { filter['ip_src'] = qc['filters'][fi].ip_src }
if (qc['filters'][fi].ip_dest !== "") { filter['ip_dest'] = qc['filters'][fi].ip_dest }
if (qc['filters'][fi].ip_src !== "") { filter['ip.src'] = qc['filters'][fi].ip_src }
if (qc['filters'][fi].ip_dest !== "") { filter['ip.dest'] = qc['filters'][fi].ip_dest }
if (qc['filters'][fi].dscp !== "") { filter['dscp'] = qc['filters'][fi].dscp }
if (Object.keys(filter).length === 0) { continue }
@ -1474,8 +1474,8 @@
proto: qc['filters'][fi].hasOwnProperty('proto') ? qc['filters'][fi]['proto'].split(',') : [],
sport: qc['filters'][fi].hasOwnProperty('sport') ? qc['filters'][fi]['sport'] : '',
dport: qc['filters'][fi].hasOwnProperty('dport') ? qc['filters'][fi]['dport'] : '',
ip_src: qc['filters'][fi].hasOwnProperty('ip_src') ? qc['filters'][fi]['ip_src'] : '',
ip_dest: qc['filters'][fi].hasOwnProperty('ip_dest') ? qc['filters'][fi]['ip_dest'] : '',
ip_src: qc['filters'][fi].hasOwnProperty('ip.src') ? qc['filters'][fi]['ip.src'] : '',
ip_dest: qc['filters'][fi].hasOwnProperty('ip.dest') ? qc['filters'][fi]['ip.dest'] : '',
dscp: qc['filters'][fi].hasOwnProperty('dscp') ? qc['filters'][fi]['dscp'] : ''
})
}