BUG fix

1. DNS error during Static ip settings
2. Incorrect IP reported on the INFO page #13

Author: gjroots

components/utils/initialization.c

@@ -67,7 +67,7 @@ esp_err_t IRAM_ATTR parms_init()
     gateway_addr = (gateway_addr != NULL) ? gateway_addr : "";
 
     ap_ip = (ap_ip != NULL) ? ap_ip : DEFAULT_AP_IP;
-    customDNSip = (customDNSip != NULL) ? customDNSip : "default";
+    customDNSip = (customDNSip != NULL) ? customDNSip : DEFAULT_DNS1;
 
     authUsername = (authUsername != NULL) ? authUsername : DEFAULT_ADMIN_USERNAME;
     authPass = (authPass != NULL) ? authPass : DEFAULT_ADMIN_PASSWORD;
@@ -82,13 +82,13 @@ esp_err_t IRAM_ATTR parms_init()
     auth_info.username = authUsername;
     auth_info.password = authPass;
 
-    if (IsCustomDnsEnable)
-    {
-        if (strcmp(customDNSip, "default") == 0)
-        {
-            customDNSip = DEFAULT_DNS1;
-        }
-    }
+    // if (IsCustomDnsEnable)
+    // {
+    //     if (strcmp(customDNSip, "default") == 0)
+    //     {
+    //         customDNSip = DEFAULT_DNS1;
+    //     }
+    // }
 
     macAp = currentMAC; //(macAp != NULL) ? macAp : currentMAC;
 

components/web_server/www/html/_i18n/english.yml

@@ -120,7 +120,7 @@ info:
         table:
             A: "version"
             B: "Update"
-            C: "IP / gateway"
+            C: "IP / DNS"
     card-2:
         header: "Connected Users ($$)"
         table:

components/web_server/www/html/js/info.js

@@ -3,7 +3,7 @@
 var versionCell = getE("version"),
 	ipGateway = getE("ipGatewayAddress"),
 	ipAddress,
-	gateWay,
+	dns,
 	connection = getE("connection"),
 	connectedUserCount = getE('clientsFound'),
 	connectedUsers = getE('users'),
@@ -28,7 +28,7 @@ function getData() {
 			}
 			// console.log(res.clients.length)
 			ipAddress = res.ipAddress;
-			gateWay = res.gatewayAddress;
+			dns = res.dns;
 			ap_rss = res.rss;
 			wifiAuthFail = res.wifiAuthFail;
 			clients = res.clients;
@@ -133,7 +133,7 @@ function ap_connection() {
 	tr += '<td class=' + (state ? "green" : "red") + '><b>' + (state ? 'Connected' : (wifiAuthFail ? "wifi Auth Fail" : 'Disconnected')) + '<b></td><tr>';
 	connection.innerHTML = tr;
 
-	tr = '<tr><td>{% t info.card-1.table.C %}</td><td><b>' + ipAddress + '</b></td><td>' + gateWay + '</td></tr>';
+	tr = '<tr><td>{% t info.card-1.table.C %}</td><td><b>' + ipAddress + '</b></td><td>' + dns + '</td></tr>';
 	ap_rss != 0 ? ipGateway.innerHTML = tr : "";
 }
 function users() {

components/web_server/www/html/sysinfo.json

@@ -1,7 +1,7 @@
 {
   "ipAddress": "192.168.1.128",
-  "gatewayAddress": "192.168.1.1",
-  "rss": -70,
+  "dns": "192.168.1.1",
+    "rss": -70,
   "wifiAuthFail" : false,
   "clients": [
     {

components/web_server/www/output/gzip/info.js.gz

@@ -15,6 +15,7 @@ extern "C"
 
     char *wifi_scan_handler(void);
     char *wifi_info_handler(void);
+    bool has_static_ip;
 
 #ifdef __cplusplus
 }

components/wifi_handler/include/wifi_handler.h

@@ -24,6 +24,7 @@
 #include "wifi_init.h"
 #include "wifi_event_handler.h"
 #include "router_handler.h"
+#include "wifi_handler.h"
 
 static const char *TAG = "wifi_event_handler";
 EventGroupHandle_t wifi_event_group;
@@ -77,7 +78,7 @@ void set_dns_server(esp_netif_dns_info_t dnsIP)
 {
     dhcps_offer_t opt_val = OFFER_DNS;
     esp_netif_dhcps_stop(wifiAP);
-    if (IsCustomDnsEnable)
+    if (IsCustomDnsEnable || has_static_ip)
     {
         dnsIP.ip.u_addr.ip4.addr = ipaddr_addr(customDNSip);
     }

components/wifi_handler/wifi_event_handler.c

@@ -87,24 +87,29 @@ char* IRAM_ATTR wifi_info_handler(void)
     tcpip_adapter_ip_info_t ip_info;
     tcpip_adapter_dns_info_t dns_info;
     int8_t rssi = 0;
-    char *dns = "";
-    char *ip_address = "";
-    memset(&ap_info, 0, sizeof(ap_info));
+    char gateway_address[32];
+    char ip_address[32];
+    char dns[32];
     if (ap_connect)
     {
+        memset(&ap_info, 0, sizeof(ap_info));
+        memset(&ip_info, 0, sizeof(ip_info));
         if (esp_wifi_sta_get_ap_info(&ap_info) == ESP_OK)
         {
             rssi = ap_info.rssi;
-            tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info);
-            ip_address = ip4addr_ntoa(&ip_info.ip);
-            tcpip_adapter_get_dns_info(TCPIP_ADAPTER_IF_STA, ESP_NETIF_DNS_MAIN, &dns_info);
-            dns = ip4addr_ntoa((ip4_addr_t *)&dns_info.ip);
+            ESP_ERROR_CHECK(tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info));
+            ESP_ERROR_CHECK(tcpip_adapter_get_dns_info(TCPIP_ADAPTER_IF_STA, ESP_NETIF_DNS_MAIN, &dns_info));
+
+            strlcpy(gateway_address, ip4addr_ntoa(&ip_info.gw), sizeof(gateway_address));
+            strlcpy(ip_address, ip4addr_ntoa(&ip_info.ip), sizeof(ip_address));
+            strlcpy(dns, ip4addr_ntoa((ip4_addr_t *)&dns_info.ip), sizeof(dns));
         }
         else
         {
             rssi = 0;
-            dns = "";
-            ip_address = "";
+            strcpy(gateway_address, "");
+            strcpy(ip_address, "");
+            strcpy(dns, "");
         }
     }
     memset(&wifi_sta_list, 0, sizeof(wifi_sta_list));
@@ -113,8 +118,9 @@ char* IRAM_ATTR wifi_info_handler(void)
     ESP_ERROR_CHECK(tcpip_adapter_get_sta_list(&wifi_sta_list, &adapter_sta_list));
 
     cJSON *root = cJSON_CreateObject();
+    cJSON_AddStringToObject(root, "gatewayAddress", gateway_address);
     cJSON_AddStringToObject(root, "ipAddress", ip_address);
-    cJSON_AddStringToObject(root, "gatewayAddress", dns);
+    cJSON_AddStringToObject(root, "dns", (has_static_ip || IsCustomDnsEnable) ? customDNSip : dns);
     cJSON_AddNumberToObject(root, "rss", rssi);
     cJSON_AddBoolToObject(root, "wifiAuthFail", IsWifiAuthFail);
     cJSON *clients = cJSON_AddArrayToObject(root, "clients");