Merge pull request arduino#87 from JAndrassy/dns_ip

Add a new command to return the DNS IP.
adafruit · Sep 18, 2023 · feca160 · feca160
2 parents c84aa34 + 7a5695d
commit feca160
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/arduino/libraries/WiFi/src/WiFi.cpp b/arduino/libraries/WiFi/src/WiFi.cpp
@@ -464,6 +464,11 @@ uint32_t WiFiClass::gatewayIP()
   return _ipInfo.gw.addr;
 }
 
+uint32_t WiFiClass::dnsIP(int n)
+{
+  return dns_getserver(n).u_addr.ip4.addr;
+}
+
 char* WiFiClass::SSID()
 {
   return (char*)_apRecord.ssid;

diff --git a/arduino/libraries/WiFi/src/WiFi.h b/arduino/libraries/WiFi/src/WiFi.h
@@ -76,6 +76,7 @@ class WiFiClass
   uint32_t localIP();
   uint32_t subnetMask();
   uint32_t gatewayIP();
+  uint32_t dnsIP(int n = 0);
   char* SSID();
   int32_t RSSI();
   uint8_t encryptionType();

diff --git a/main/CommandHandler.cpp b/main/CommandHandler.cpp
@@ -256,6 +256,22 @@ int getTemperature(const uint8_t command[], uint8_t response[])
   return 9;
 }
 
+int getDNSconfig(const uint8_t command[], uint8_t response[])
+{
+  uint32_t dnsip0 = WiFi.dnsIP();
+  uint32_t dnsip1 = WiFi.dnsIP(1);
+
+  response[2] = 2; // number of parameters
+
+  response[3] = 4; // parameter 1 length
+  memcpy(&response[4], &dnsip0, sizeof(dnsip0));
+
+  response[8] = 4; // parameter 2 length
+  memcpy(&response[9], &dnsip1, sizeof(dnsip1));
+
+  return 14;
+}
+
 int getReasonCode(const uint8_t command[], uint8_t response[])
 {
   uint8_t reasonCode = WiFi.reasonCode();
@@ -2061,7 +2077,7 @@ const CommandHandlerType commandHandlers[] = {
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 
   // 0x10 -> 0x1f
-  setNet, setPassPhrase, setKey, NULL, setIPconfig, setDNSconfig, setHostname, setPowerMode, setApNet, setApPassPhrase, setDebug, getTemperature, NULL, NULL, NULL, getReasonCode,
+  setNet, setPassPhrase, setKey, NULL, setIPconfig, setDNSconfig, setHostname, setPowerMode, setApNet, setApPassPhrase, setDebug, getTemperature, NULL, NULL, getDNSconfig, getReasonCode,
 
   // 0x20 -> 0x2f
   getConnStatus, getIPaddr, getMACaddr, getCurrSSID, getCurrBSSID, getCurrRSSI, getCurrEnct, scanNetworks, startServerTcp, getStateTcp, dataSentTcp, availDataTcp, getDataTcp, startClientTcp, stopClientTcp, getClientStateTcp,