diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index cbc33ea..ed60200 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -69,13 +69,13 @@ public: std::string managementIp, managementGateway, mode, dataIp; unsigned int dataMtu = 1500; - TerminalNetworkSettings() { this->reset(); } + TerminalNetworkSettings() = default; TerminalNetworkSettings(const TerminalNetworkSettings& src) = default; ~TerminalNetworkSettings() = default; TerminalNetworkSettings& operator= (const TerminalNetworkSettings& src) = default; - void reset() { + void loadDefaults() { managementIp = "0.0.0.0/0"; managementGateway = ""; mode = "l2"; @@ -185,6 +185,7 @@ private: if (tmp == "tun") { s.mode = "l3"; CP_GetNetwork(sid, "addr_data", &s.dataIp); + s.dataIp += "/24"; } else { s.mode = "l2"; s.dataIp = "0.0.0.0/24"; @@ -460,7 +461,7 @@ public: if (readback) { std::string tmp; - s.reset(); + s.loadDefaults(); s.managementIp.clear(); CP_GetNetwork(sid, "addr", &s.managementIp); CP_GetNetwork(sid, "mask", &tmp); diff --git a/static/main.html b/static/main.html index 619d57f..c10a663 100644 --- a/static/main.html +++ b/static/main.html @@ -1618,7 +1618,8 @@ const doFetchAbout = async () => { try { - let d = await fetch("/api/get/aboutFirmware") + const fr = await fetch("/api/get/aboutFirmware") + const d = await fr.json() this.about.firmwareVersion = d["fw.version"] this.about.modemUid = d["fw.modemId"] this.about.modemSn = d["fw.modemSn"]