app+transport: WiFi* => Network* for ESP32

yoursunny · Jul 14, 2024 · f724432 · f724432
1 parent 6eabfb0
commit f724432
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/examples/PingClient/PingClient.ino b/examples/PingClient/PingClient.ino
@@ -2,8 +2,8 @@
 #include <ESP8266WiFi.h>
 #include <WiFiClientSecureBearSSL.h>
 #elif defined(ARDUINO_ARCH_ESP32)
+#include <NetworkClientSecure.h>
 #include <WiFi.h>
-#include <WiFiClientSecure.h>
 #endif
 #include <esp8266ndn.h>
 
@@ -42,7 +42,7 @@ setup() {
   BearSSL::WiFiClientSecure fchSocketClient;
   fchSocketClient.setInsecure();
 #elif defined(ARDUINO_ARCH_ESP32)
-  WiFiClientSecure fchSocketClient;
+  NetworkClientSecure fchSocketClient;
   fchSocketClient.setInsecure();
 #endif
   auto fchResponse = esp8266ndn::fchQuery(fchSocketClient);

diff --git a/src/app/autoconfig.cpp b/src/app/autoconfig.cpp
@@ -16,7 +16,7 @@
 namespace esp8266ndn {
 
 FchResponse
-fchQuery(::WiFiClient& client, String serviceUri) {
+fchQuery(ESP8266NDN_NetworkClient& client, String serviceUri) {
   FchResponse res;
   HTTPClient http;
   http.begin(client, serviceUri);
@@ -31,7 +31,7 @@ fchQuery(::WiFiClient& client, String serviceUri) {
   body.trim();
   LOG(serviceUri << F(" body: ") << body);
 
-  if (!WiFi.hostByName(body.c_str(), res.ip)) {
+  if (!ESP8266NDN_Network.hostByName(body.c_str(), res.ip)) {
     LOG(F("DNS error"));
     return res;
   }

diff --git a/src/app/autoconfig.hpp b/src/app/autoconfig.hpp
@@ -6,7 +6,15 @@
 #include <IPAddress.h>
 #include <WString.h>
 
-class WiFiClient;
+#if defined(ARDUINO_ARCH_ESP8266)
+#define ESP8266NDN_Network WiFi
+#define ESP8266NDN_NetworkClient WiFiClient
+#elif defined(ARDUINO_ARCH_ESP32)
+#define ESP8266NDN_Network Network
+#define ESP8266NDN_NetworkClient NetworkClient
+#endif
+
+class ESP8266NDN_NetworkClient;
 
 namespace esp8266ndn {
 
@@ -17,11 +25,12 @@ struct FchResponse {
 
 /**
  * @brief Query NDN-FCH service to find a nearby NDN router.
- * @param client @c WiFiClient or @c WiFiClientSecure instance.
+ * @param client @c WiFiClient or @c WiFiClientSecure instance on ESP8266;
+ *               @c NetworkClient or @c NetworkClientSecure instance on ESP32.
  * @param serviceUri NDN-FCH service base URI.
  */
 FchResponse
-fchQuery(::WiFiClient& client, String serviceUri = "https://fch.ndn.today/");
+fchQuery(ESP8266NDN_NetworkClient& client, String serviceUri = "https://fch.ndn.today/");
 
 } // namespace esp8266ndn
 

diff --git a/src/transport/udp-transport.hpp b/src/transport/udp-transport.hpp
@@ -8,8 +8,12 @@
 #if defined(ARDUINO_ARCH_ESP8266)
 // cause WiFiUdp.h to use ESP8266WiFi instead of Arduino WiFi library
 #include <ESP8266WiFi.h>
-#endif
 #include <WiFiUdp.h>
+#define ESP8266NDN_NetworkUDP WiFiUDP
+#elif defined(ARDUINO_ARCH_ESP32)
+#include <NetworkUdp.h>
+#define ESP8266NDN_NetworkUDP NetworkUDP
+#endif
 
 namespace esp8266ndn {
 
@@ -93,7 +97,7 @@ class UdpTransport : public virtual ndnph::Transport {
   size_t m_bufcap = 0;
   std::unique_ptr<uint8_t[]> m_ownBuf;
 
-  WiFiUDP m_udp;
+  ESP8266NDN_NetworkUDP m_udp;
 #if LWIP_IPV6
   using EndpointIdHelper = ndnph::port_transport_socket::Ipv6EndpointIdHelper<4>;
 #else