Decouple network related libraries from WiFi

me-no-dev · me-no-dev · commit da4d198478d0 · 2023-10-31T03:00:21.000+02:00
diff --git a/libraries/ArduinoOTA/src/ArduinoOTA.cpp b/libraries/ArduinoOTA/src/ArduinoOTA.cpp
@@ -2,8 +2,8 @@
 #define LWIP_OPEN_SRC
 #endif
 #include <functional>
-#include <WiFiUdp.h>
 #include "ArduinoOTA.h"
+#include "WiFiClient.h"
 #include "ESPmDNS.h"
 #include "MD5Builder.h"
 #include "Update.h"
@@ -128,7 +128,7 @@ void ArduinoOTAClass::begin() {
     if (!_hostname.length()) {
         char tmp[20];
         uint8_t mac[6];
-        WiFi.macAddress(mac);
+        Network.macAddress(mac);
         sprintf(tmp, "esp32-%02x%02x%02x%02x%02x%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
         _hostname = tmp;
     }
diff --git a/libraries/ArduinoOTA/src/ArduinoOTA.h b/libraries/ArduinoOTA/src/ArduinoOTA.h
@@ -1,9 +1,9 @@
 #ifndef __ARDUINO_OTA_H
 #define __ARDUINO_OTA_H
 
-#include <WiFi.h>
-#include <functional>
+#include "Networking.h"
 #include "Update.h"
+#include <functional>
 
 #define INT_BUFFER_SIZE 16
 
diff --git a/libraries/ESPmDNS/src/ESPmDNS.cpp b/libraries/ESPmDNS/src/ESPmDNS.cpp
@@ -39,10 +39,8 @@ License (MIT license):
 #endif
 
 #include "ESPmDNS.h"
-#include "WiFi.h"
 #include <functional>
-#include "esp_wifi.h"
-#include "esp_wifi_types.h"
+#include "esp_mac.h"
 
 // Add quotes around defined value
 #ifdef __IN_ECLIPSE__
@@ -115,7 +113,7 @@ void MDNSResponder::disableArduino(){
 void MDNSResponder::enableWorkstation(esp_interface_t interface){
     char winstance[21+_hostname.length()];
     uint8_t mac[6];
-    esp_wifi_get_mac((wifi_interface_t)interface, mac);
+    esp_base_mac_addr_get(mac);
     sprintf(winstance, "%s [%02x:%02x:%02x:%02x:%02x:%02x]", _hostname.c_str(), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
     if(mdns_service_add(NULL, "_workstation", "_tcp", 9, NULL, 0)) {
diff --git a/libraries/HTTPClient/src/HTTPClient.cpp b/libraries/HTTPClient/src/HTTPClient.cpp
@@ -30,7 +30,7 @@
 #include <esp32-hal-log.h>  
 
 #ifdef HTTPCLIENT_1_1_COMPATIBLE
-#include <WiFi.h>
+#include <WiFiClient.h>
 #include <WiFiClientSecure.h>
 #endif
 
diff --git a/libraries/HTTPUpdate/src/HTTPUpdate.cpp b/libraries/HTTPUpdate/src/HTTPUpdate.cpp
@@ -191,8 +191,11 @@ HTTPUpdateResult HTTPUpdate::handleUpdate(HTTPClient& http, const String& curren
     http.setFollowRedirects(_followRedirects);
     http.setUserAgent("ESP32-http-Update");
     http.addHeader("Cache-Control", "no-cache");
+    http.addHeader("x-ESP32-BASE-MAC", Network.macAddress());
+#if SOC_WIFI_SUPPORTED
     http.addHeader("x-ESP32-STA-MAC", WiFi.macAddress());
     http.addHeader("x-ESP32-AP-MAC", WiFi.softAPmacAddress());
+#endif
     http.addHeader("x-ESP32-free-space", String(ESP.getFreeSketchSpace()));
     http.addHeader("x-ESP32-sketch-size", String(ESP.getSketchSize()));
     String sketchMD5 = ESP.getSketchMD5();
diff --git a/libraries/HTTPUpdate/src/HTTPUpdate.h b/libraries/HTTPUpdate/src/HTTPUpdate.h
@@ -27,9 +27,7 @@
 #define ___HTTP_UPDATE_H___
 
 #include <Arduino.h>
-#include <WiFi.h>
-#include <WiFiClient.h>
-#include <WiFiUdp.h>
+#include <Networking.h>
 #include <HTTPClient.h>
 #include <Update.h>
 
diff --git a/libraries/NetBIOS/src/NetBIOS.cpp b/libraries/NetBIOS/src/NetBIOS.cpp
@@ -1,5 +1,4 @@
 #include "NetBIOS.h"
-
 #include <functional>
 
 #define NBNS_PORT 137
@@ -92,7 +91,7 @@ void NetBIOS::_onPacket(AsyncUDPPacket& packet){
                 append_32((void *)&nbnsa.ttl, 300000);
                 append_16((void *)&nbnsa.data_len, 6);
                 append_16((void *)&nbnsa.flags, 0);
-                nbnsa.addr = WiFi.localIP();
+                nbnsa.addr = packet.localIP();
                 _udp.writeTo((uint8_t *)&nbnsa, sizeof(nbnsa), packet.remoteIP(), NBNS_PORT);
             }
         }
@@ -102,6 +101,7 @@ void NetBIOS::_onPacket(AsyncUDPPacket& packet){
 NetBIOS::NetBIOS(){
 
 }
+
 NetBIOS::~NetBIOS(){
     end();
 }
diff --git a/libraries/NetBIOS/src/NetBIOS.h b/libraries/NetBIOS/src/NetBIOS.h
@@ -2,7 +2,7 @@
 #ifndef __ESPNBNS_h__
 #define __ESPNBNS_h__
 
-#include <WiFi.h>
+#include "Arduino.h"
 #include "AsyncUDP.h"
 
 class NetBIOS
diff --git a/libraries/Networking/src/ESP_Network_Manager.cpp b/libraries/Networking/src/ESP_Network_Manager.cpp
@@ -3,9 +3,7 @@
 #include "lwip/ip_addr.h"
 #include "lwip/dns.h"
 #include "esp32-hal-log.h"
-#if CONFIG_IDF_TARGET_ESP32
 #include "esp_mac.h"
-#endif
 
 ESP_Network_Manager::ESP_Network_Manager(){
 
@@ -38,8 +36,7 @@ bool ESP_Network_Manager::begin(){
  * @param ipaddr
  * @param callback_arg
  */
-static void wifi_dns_found_callback(const char *name, const ip_addr_t *ipaddr, void *callback_arg)
-{
+static void wifi_dns_found_callback(const char *name, const ip_addr_t *ipaddr, void *callback_arg){
     if(ipaddr) {
         (*reinterpret_cast<IPAddress*>(callback_arg)) = ipaddr->u_addr.ip4.addr;
     }
@@ -53,8 +50,7 @@ static void wifi_dns_found_callback(const char *name, const ip_addr_t *ipaddr, v
  * @return 1 if aIPAddrString was successfully converted to an IP address,
  *          else error code
  */
-int ESP_Network_Manager::hostByName(const char* aHostname, IPAddress& aResult)
-{
+int ESP_Network_Manager::hostByName(const char* aHostname, IPAddress& aResult){
     if (!aResult.fromString(aHostname))
     {
         ip_addr_t addr;
@@ -76,4 +72,17 @@ int ESP_Network_Manager::hostByName(const char* aHostname, IPAddress& aResult)
     return (uint32_t)aResult != 0;
 }
 
+uint8_t * ESP_Network_Manager::macAddress(uint8_t * mac){
+    esp_base_mac_addr_get(mac);
+    return mac;
+}
+
+String ESP_Network_Manager::macAddress(void){
+    uint8_t mac[6];
+    char macStr[18] = { 0 };
+    macAddress(mac);
+    sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+    return String(macStr);
+}
+
 ESP_Network_Manager Network;
diff --git a/libraries/Networking/src/ESP_Network_Manager.h b/libraries/Networking/src/ESP_Network_Manager.h
@@ -2,13 +2,16 @@
 
 #include "ESP_Network_Events.h"
 #include "IPAddress.h"
+#include "WString.h"
 
 class ESP_Network_Manager : public ESP_Network_Events {
 public:
 	ESP_Network_Manager();
 
 	bool begin();
 	int hostByName(const char *aHostname, IPAddress &aResult);
+	uint8_t * macAddress(uint8_t * mac);
+	String macAddress();
 };
 
 extern ESP_Network_Manager Network;
diff --git a/libraries/WebServer/src/WebServer.h b/libraries/WebServer/src/WebServer.h
@@ -26,7 +26,7 @@
 
 #include <functional>
 #include <memory>
-#include <WiFi.h>
+#include "Networking.h"
 #include "HTTP_Method.h"
 #include "Uri.h"
 
diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp b/libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
@@ -130,7 +130,7 @@ int WiFiClientSecure::connect(IPAddress ip, uint16_t port, const char *CA_cert,
 int WiFiClientSecure::connect(const char *host, uint16_t port, const char *CA_cert, const char *cert, const char *private_key)
 {
     IPAddress address;
-    if (!WiFi.hostByName(host, address))
+    if (!Network.hostByName(host, address))
         return 0;
 
     return connect(address, port, host, CA_cert, cert, private_key);
@@ -157,7 +157,7 @@ int WiFiClientSecure::connect(const char *host, uint16_t port, const char *pskId
     log_v("start_ssl_client with PSK");
 
     IPAddress address;
-    if (!WiFi.hostByName(host, address))
+    if (!Network.hostByName(host, address))
         return 0;
 
     int ret = start_ssl_client(sslclient, address, port, host, _timeout, NULL, false, NULL, NULL, pskIdent, psKey, _use_insecure, _alpn_protos);
diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.h b/libraries/WiFiClientSecure/src/WiFiClientSecure.h
@@ -22,7 +22,7 @@
 #define WiFiClientSecure_h
 #include "Arduino.h"
 #include "IPAddress.h"
-#include <WiFi.h>
+#include "Networking.h"
 #include "ssl_client.h"
 
 class WiFiClientSecure : public WiFiClient
diff --git a/libraries/WiFiClientSecure/src/ssl_client.cpp b/libraries/WiFiClientSecure/src/ssl_client.cpp
@@ -18,7 +18,6 @@
 #include <string>
 #include "ssl_client.h"
 #include "esp_crt_bundle.h"
-#include "WiFi.h"
 
 #if !defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED) && !defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
 #  warning "Please call `idf.py menuconfig` then go to Component config -> mbedTLS -> TLS Key Exchange Methods -> Enable pre-shared-key ciphersuites and then check `Enable PSK based cyphersuite modes`. Save and Quit."

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "NetBIOS.h"`
`2`		`-`
`3`	`2`	`#include <functional>`
`4`	`3`
`5`	`4`	`#define NBNS_PORT 137`
`@@ -92,7 +91,7 @@ void NetBIOS::_onPacket(AsyncUDPPacket& packet){`
`92`	`91`	`append_32((void *)&nbnsa.ttl, 300000);`
`93`	`92`	`append_16((void *)&nbnsa.data_len, 6);`
`94`	`93`	`append_16((void *)&nbnsa.flags, 0);`
`95`		`- nbnsa.addr = WiFi.localIP();`
	`94`	`+ nbnsa.addr = packet.localIP();`
`96`	`95`	`_udp.writeTo((uint8_t *)&nbnsa, sizeof(nbnsa), packet.remoteIP(), NBNS_PORT);`
`97`	`96`	`}`
`98`	`97`	`}`
`@@ -102,6 +101,7 @@ void NetBIOS::_onPacket(AsyncUDPPacket& packet){`
`102`	`101`	`NetBIOS::NetBIOS(){`
`103`	`102`
`104`	`103`	`}`
	`104`	`+`
`105`	`105`	`NetBIOS::~NetBIOS(){`
`106`	`106`	`end();`
`107`	`107`	`}`