diff --git a/src/settings/dns/enabled.cpp b/src/settings/dns/enabled.cpp index 4628b2c..db90db6 100644 --- a/src/settings/dns/enabled.cpp +++ b/src/settings/dns/enabled.cpp @@ -31,6 +31,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); int dns_enabled = config::config.getConfig()["settings"]["dns"]["enabled"]; std::stringstream responsedata; responsedata << R"({"enabled":")" << dns_enabled << R"("})"; diff --git a/src/settings/dns/local_domains.cpp b/src/settings/dns/local_domains.cpp index f0507fd..08af734 100644 --- a/src/settings/dns/local_domains.cpp +++ b/src/settings/dns/local_domains.cpp @@ -29,6 +29,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); std::stringstream responsedata; responsedata << R"({"domains":)"; responsedata << config::config.getConfig()["settings"]["dns"]["localdomains"]; diff --git a/src/settings/dns/servers.cpp b/src/settings/dns/servers.cpp index f3bd946..35e50f9 100644 --- a/src/settings/dns/servers.cpp +++ b/src/settings/dns/servers.cpp @@ -29,6 +29,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); std::stringstream responsedata; responsedata << R"({"servers":)"; responsedata << config::config.getConfig()["settings"]["dns"]["servers"]; diff --git a/src/settings/ftp/ftp.cpp b/src/settings/ftp/ftp.cpp index ee6de88..50a7271 100644 --- a/src/settings/ftp/ftp.cpp +++ b/src/settings/ftp/ftp.cpp @@ -31,6 +31,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); int ftp_enabled = config::config.getConfig()["settings"]["ftp"]["enabled"]; std::stringstream responsedata; responsedata << R"({"enabled":")" << ftp_enabled << R"("})"; diff --git a/src/settings/ssh/keys.cpp b/src/settings/ssh/keys.cpp index d386242..f602a6e 100644 --- a/src/settings/ssh/keys.cpp +++ b/src/settings/ssh/keys.cpp @@ -31,6 +31,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); std::stringstream responsedata; responsedata << R"({"keys":)"; responsedata << config::config.getConfig()["settings"]["ssh"]["keys"]; diff --git a/src/settings/ssh/port.cpp b/src/settings/ssh/port.cpp index 75dac70..c8c6ccc 100644 --- a/src/settings/ssh/port.cpp +++ b/src/settings/ssh/port.cpp @@ -36,6 +36,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); int ssh_port = config::config.getConfig()["settings"]["ssh"]["port"]; std::stringstream responsedata; responsedata << R"({"port":")" << ssh_port << R"("})"; diff --git a/src/settings/ssh/server.cpp b/src/settings/ssh/server.cpp index fc8f097..8f19c34 100644 --- a/src/settings/ssh/server.cpp +++ b/src/settings/ssh/server.cpp @@ -17,6 +17,7 @@ namespace api { std::string get_ssh_server() { + config::config.setConfig(std::string("../config.json")); return config::config.getConfig()["settings"]["ssh"]["server"]; } diff --git a/src/settings/ssh/status.cpp b/src/settings/ssh/status.cpp index 78f8c33..f8dd807 100644 --- a/src/settings/ssh/status.cpp +++ b/src/settings/ssh/status.cpp @@ -31,6 +31,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); int ssh_status = config::config.getConfig()["settings"]["ssh"]["enabled"]; std::stringstream responsedata; responsedata << R"({"status":")" << ssh_status << R"("})"; diff --git a/src/settings/telnet/enabled.cpp b/src/settings/telnet/enabled.cpp index 0bf3cb7..811e6c6 100644 --- a/src/settings/telnet/enabled.cpp +++ b/src/settings/telnet/enabled.cpp @@ -35,6 +35,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); int telnet_enabled = config::config.getConfig()["settings"]["telnet"]["enabled"]; std::stringstream responsedata; responsedata << R"({"enabled":")" << telnet_enabled << R"("})"; diff --git a/src/settings/telnet/port.cpp b/src/settings/telnet/port.cpp index 4240910..a55b7fd 100644 --- a/src/settings/telnet/port.cpp +++ b/src/settings/telnet/port.cpp @@ -35,6 +35,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); int telnet_port = config::config.getConfig()["settings"]["telnet"]["port"]; std::stringstream responsedata; responsedata << R"({"port":")" << telnet_port << R"("})"; diff --git a/src/settings/wifi/channel.cpp b/src/settings/wifi/channel.cpp index c8d6bfd..7b7056f 100644 --- a/src/settings/wifi/channel.cpp +++ b/src/settings/wifi/channel.cpp @@ -35,6 +35,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); int wifi_channel = config::config.getConfig()["settings"]["wifi"]["channel"]; std::stringstream responsedata; responsedata << R"({"channel":")" << wifi_channel << R"("})"; @@ -84,6 +85,7 @@ namespace api system("rc restart hostapd"); std::string syslogstring = "WIFI channel changed to " + new_channel; syslog(LOG_INFO, "%s", syslogstring.c_str()); + sleep(1); config::config.setConfig(std::string("../config.json")); nlohmann::json new_config = config::config.getConfig(); new_config["settings"]["wifi"]["channel"] = std::stoi(new_channel); diff --git a/src/settings/wifi/name.cpp b/src/settings/wifi/name.cpp index a54b5f7..d6827d3 100644 --- a/src/settings/wifi/name.cpp +++ b/src/settings/wifi/name.cpp @@ -35,6 +35,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); std::string wifi_name = config::config.getConfig()["settings"]["wifi"]["name"]; std::stringstream responsedata; responsedata << R"({"name":")" << wifi_name << R"("})"; diff --git a/src/settings/wifi/password.cpp b/src/settings/wifi/password.cpp index b8a9d2b..2c2e3f1 100644 --- a/src/settings/wifi/password.cpp +++ b/src/settings/wifi/password.cpp @@ -35,6 +35,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); std::string wifi_password = config::config.getConfig()["settings"]["wifi"]["password"]; std::stringstream responsedata; responsedata << R"({"password":")" << wifi_password << R"("})"; diff --git a/src/settings/wifi/qr.cpp b/src/settings/wifi/qr.cpp index a059a84..e060c4b 100644 --- a/src/settings/wifi/qr.cpp +++ b/src/settings/wifi/qr.cpp @@ -30,6 +30,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); std::string wifi_password = config::config.getConfig()["settings"]["wifi"]["password"]; std::string wifi_name = config::config.getConfig()["settings"]["wifi"]["name"]; std::stringstream toqrstring; diff --git a/src/settings/wifi/status.cpp b/src/settings/wifi/status.cpp index 1f1cce9..83f836c 100644 --- a/src/settings/wifi/status.cpp +++ b/src/settings/wifi/status.cpp @@ -31,6 +31,7 @@ namespace api response.set_content(R"({"access":"reject"})", JSON_TYPE); return; } + config::config.setConfig(std::string("../config.json")); int wifi_status = config::config.getConfig()["settings"]["wifi"]["enabled"]; std::stringstream responsedata; responsedata << R"({"status":")" << wifi_status << R"("})"; @@ -72,6 +73,7 @@ namespace api system("rc add hostapd"); syslog(LOG_INFO, "%s", "WIFI is enabled"); } + sleep(1); config::config.setConfig(std::string("../config.json")); nlohmann::json new_config = config::config.getConfig(); new_config["settings"]["wifi"]["enabled"] = new_wifi_status;