From ac04c0545b8c118695b16c1a46b560d894f51915 Mon Sep 17 00:00:00 2001
From: Vladislav Ostapov <Vlados.ost.31@yandex.ru>
Date: Fri, 15 Nov 2024 15:12:19 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81:=20=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D1=81=D0=B8=D1=8F=20=D0=9F=D0=9E=20=D0=B8=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=87=D0=B5=D0=B5=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=B7=D1=8B=D0=B2=D0=B0=D0=BB=D0=BE=D1=81=D1=8C=20=D0=B2=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D0=B1=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/terminal_api_driver.cpp | 7 ++++---
 static/main.html            | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

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"]