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

исправление багов: принудительная остановка ssl сервера, ошибка применения QoS профиля, ошибка применения последовательности голда, небольшие изменения в верстке мониторинга

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-01-21 19:56:44 +03:00
parent c54c467f9d
commit 130c3c4dfc
8 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/connection.cpp
View File

@@ -59,7 +59,8 @@ namespace http::server {
reply_.headers.push_back({.name = "Connection", .value = "keep-alive"});
}
BOOST_LOG_TRIVIAL(info) << "HTTP query " << reply_.status << " " << request_.method << " " << request_.queryUri;
const auto ep = socket_.remote_endpoint();
BOOST_LOG_TRIVIAL(info) << "HTTP query " << ep.address().to_string() << ":" << ep.port() << " " << reply_.status << " " << request_.method << " " << request_.queryUri;
auto self(shared_from_this());
async_write(socket_, reply_.to_buffers(), [this, self](boost::system::error_code ec, std::size_t) {
@@ -92,6 +93,7 @@ namespace http::server {
void SslConnection::stop() {
try {
stream_.next_layer().socket().close();
stream_.shutdown();
} catch (std::exception& e) {
BOOST_LOG_TRIVIAL(warning) << "SslConnection::stop(): Can't shutdown ssl socket: " << e.what();
@@ -133,7 +135,8 @@ namespace http::server {
reply_.headers.push_back({.name = "Connection", .value = "keep-alive"});
}
BOOST_LOG_TRIVIAL(info) << "HTTPS query " << reply_.status << " " << request_.method << " " << request_.queryUri;
const auto ep = stream_.next_layer().socket().remote_endpoint();
BOOST_LOG_TRIVIAL(info) << "HTTPS query " << ep.address().to_string() << ":" << ep.port() << " " << reply_.status << " " << request_.method << " " << request_.queryUri;
auto self(shared_from_this());
async_write(stream_, reply_.to_buffers(), [this, self](boost::system::error_code ec, std::size_t) {

4
src/terminal_api_driver.cpp
View File

@@ -1037,7 +1037,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
#ifdef MODEM_IS_SCPC
mod.baudrate = pt.get<uint32_t>("txBaudrate");
mod.rollof = pt.get<unsigned int>("txRolloff");
mod.gold_seq_is_active = pt.get<bool>("txGoldan");
mod.gold_seq_is_active = pt.get<unsigned int>("txGoldan");
#endif
mod.attenuation = pt.get<double>("txAttenuation");
@@ -1054,7 +1054,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
demod.baudrate = pt.get<uint32_t>("rxBaudrate");
demod.rollof = pt.get<unsigned int>("rxRolloff");
#ifdef MODEM_IS_SCPC
demod.gold_seq_is_active = pt.get<bool>("rxGoldan");
demod.gold_seq_is_active = pt.get<unsigned int>("rxGoldan");
#endif
#ifdef MODEM_IS_SCPC