Rename WiFiClient and WiFiClientSecure

Author: me-no-dev

CMakeLists.txt

@@ -207,7 +207,7 @@ set(ARDUINO_LIBRARY_Networking_SRCS
   libraries/Networking/src/NetworkInterface.cpp
   libraries/Networking/src/NetworkEvents.cpp
   libraries/Networking/src/NetworkManager.cpp
-  libraries/Networking/src/WiFiClient.cpp
+  libraries/Networking/src/NetworkClient.cpp
   libraries/Networking/src/NetworkServer.cpp
   libraries/Networking/src/NetworkUdp.cpp)
 

libraries/ArduinoOTA/src/ArduinoOTA.cpp

@@ -3,7 +3,7 @@
 #endif
 #include <functional>
 #include "ArduinoOTA.h"
-#include "WiFiClient.h"
+#include "NetworkClient.h"
 #include "ESPmDNS.h"
 #include "MD5Builder.h"
 #include "Update.h"
@@ -266,7 +266,7 @@ void ArduinoOTAClass::_runUpdate() {
         _progress_callback(0, _size);
     }
 
-    WiFiClient client;
+    NetworkClient client;
     if (!client.connect(_ota_ip, _ota_port)) {
         if (_error_callback) {
             _error_callback(OTA_CONNECT_ERROR);

libraries/ESPmDNS/examples/mDNS_Web_Server/mDNS_Web_Server.ino

@@ -18,7 +18,7 @@
 
 #include <WiFi.h>
 #include <ESPmDNS.h>
-#include <WiFiClient.h>
+#include <NetworkClient.h>
 
 const char* ssid = "............";
 const char* password = "..............";
@@ -69,7 +69,7 @@ void setup(void)
 void loop(void)
 {
     // Check if a client has connected
-    WiFiClient client = server.accept();
+    NetworkClient client = server.accept();
     if (!client) {
         return;
     }

libraries/Ethernet/examples/ETH_LAN8720/ETH_LAN8720.ino

@@ -58,7 +58,7 @@ void testClient(const char * host, uint16_t port)
   Serial.print("\nconnecting to ");
   Serial.println(host);
 
-  WiFiClient client;
+  NetworkClient client;
   if (!client.connect(host, port)) {
     Serial.println("connection failed");
     return;

libraries/Ethernet/examples/ETH_TLK110/ETH_TLK110.ino

@@ -56,7 +56,7 @@ void testClient(const char * host, uint16_t port)
   Serial.print("\nconnecting to ");
   Serial.println(host);
 
-  WiFiClient client;
+  NetworkClient client;
   if (!client.connect(host, port)) {
     Serial.println("connection failed");
     return;

libraries/Ethernet/examples/ETH_W5500_Arduino_SPI/ETH_W5500_Arduino_SPI.ino

@@ -77,7 +77,7 @@ void testClient(const char * host, uint16_t port)
   Serial.print("\nconnecting to ");
   Serial.println(host);
 
-  WiFiClient client;
+  NetworkClient client;
   if (!client.connect(host, port)) {
     Serial.println("connection failed");
     return;

libraries/Ethernet/examples/ETH_W5500_IDF_SPI/ETH_W5500_IDF_SPI.ino

@@ -75,7 +75,7 @@ void testClient(const char * host, uint16_t port)
   Serial.print("\nconnecting to ");
   Serial.println(host);
 
-  WiFiClient client;
+  NetworkClient client;
   if (!client.connect(host, port)) {
     Serial.println("connection failed");
     return;

libraries/HTTPClient/examples/BasicHttpsClient/BasicHttpsClient.ino

@@ -12,7 +12,7 @@
 
 #include <HTTPClient.h>
 
-#include <WiFiClientSecure.h>
+#include <NetworkClientSecure.h>
 
 // This is GandiStandardSSLCA2.pem, the root Certificate Authority that signed 
 // the server certifcate for the demo server https://jigsaw.w3.org in this
@@ -53,7 +53,7 @@ const char* rootCACertificate = \
 "BT02Vf6Dsuimrdfp5gJ0iHRc2jTbkNJtUQoj1iM=\n" \
 "-----END CERTIFICATE-----\n";
 
-// Not sure if WiFiClientSecure checks the validity date of the certificate. 
+// Not sure if NetworkClientSecure checks the validity date of the certificate. 
 // Setting clock just to be sure...
 void setClock() {
   configTime(0, 0, "pool.ntp.org");
@@ -100,12 +100,12 @@ void setup() {
 }
 
 void loop() {
-  WiFiClientSecure *client = new WiFiClientSecure;
+  NetworkClientSecure *client = new NetworkClientSecure;
   if(client) {
     client -> setCACert(rootCACertificate);
 
     {
-      // Add a scoping block for HTTPClient https to make sure it is destroyed before WiFiClientSecure *client is 
+      // Add a scoping block for HTTPClient https to make sure it is destroyed before NetworkClientSecure *client is 
       HTTPClient https;
 
       Serial.print("[HTTPS] begin...\n");

libraries/HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino

@@ -63,7 +63,7 @@ void loop() {
                 uint8_t buff[128] = { 0 };
 
                 // get tcp stream
-                WiFiClient * stream = http.getStreamPtr();
+                NetworkClient * stream = http.getStreamPtr();
 
                 // read all data from server
                 while(http.connected() && (len > 0 || len == -1)) {

libraries/HTTPClient/src/HTTPClient.cpp

@@ -30,8 +30,8 @@
 #include <esp32-hal-log.h>  
 
 #ifdef HTTPCLIENT_1_1_COMPATIBLE
-#include <WiFiClient.h>
-#include <WiFiClientSecure.h>
+#include <NetworkClient.h>
+#include <NetworkClientSecure.h>
 #endif
 
 #include <StreamString.h>
@@ -50,12 +50,12 @@ class TransportTraits
     {
     }
 
-    virtual std::unique_ptr<WiFiClient> create()
+    virtual std::unique_ptr<NetworkClient> create()
     {
-        return std::unique_ptr<WiFiClient>(new WiFiClient());
+        return std::unique_ptr<NetworkClient>(new NetworkClient());
     }
 
-    virtual bool verify(WiFiClient& client, const char* host)
+    virtual bool verify(NetworkClient& client, const char* host)
     {
         return true;
     }
@@ -69,14 +69,14 @@ class TLSTraits : public TransportTraits
     {
     }
 
-    std::unique_ptr<WiFiClient> create() override
+    std::unique_ptr<NetworkClient> create() override
     {
-        return std::unique_ptr<WiFiClient>(new WiFiClientSecure());
+        return std::unique_ptr<NetworkClient>(new NetworkClientSecure());
     }
 
-    bool verify(WiFiClient& client, const char* host) override
+    bool verify(NetworkClient& client, const char* host) override
     {
-        WiFiClientSecure& wcs = static_cast<WiFiClientSecure&>(client);
+        NetworkClientSecure& wcs = static_cast<NetworkClientSecure&>(client);
         if (_cacert == nullptr) {
             wcs.setInsecure();
         } else {
@@ -135,7 +135,7 @@ void HTTPClient::clear()
  * @param https bool
  * @return success bool
  */
-bool HTTPClient::begin(WiFiClient &client, String url) {
+bool HTTPClient::begin(NetworkClient &client, String url) {
 #ifdef HTTPCLIENT_1_1_COMPATIBLE
     if(_tcpDeprecated) {
         log_d("mix up of new and deprecated api");
@@ -174,7 +174,7 @@ bool HTTPClient::begin(WiFiClient &client, String url) {
  * @param https bool
  * @return success bool
  */
-bool HTTPClient::begin(WiFiClient &client, String host, uint16_t port, String uri, bool https)
+bool HTTPClient::begin(NetworkClient &client, String host, uint16_t port, String uri, bool https)
 {
 #ifdef HTTPCLIENT_1_1_COMPATIBLE
     if(_tcpDeprecated) {
@@ -862,24 +862,24 @@ int HTTPClient::getSize(void)
 
 /**
  * returns the stream of the tcp connection
- * @return WiFiClient
+ * @return NetworkClient
  */
-WiFiClient& HTTPClient::getStream(void)
+NetworkClient& HTTPClient::getStream(void)
 {
     if (connected()) {
         return *_client;
     }
 
     log_w("getStream: not connected");
-    static WiFiClient empty;
+    static NetworkClient empty;
     return empty;
 }
 
 /**
  * returns a pointer to the stream of the tcp connection
- * @return WiFiClient*
+ * @return NetworkClient*
  */
-WiFiClient* HTTPClient::getStreamPtr(void)
+NetworkClient* HTTPClient::getStreamPtr(void)
 {
     if(connected()) {
         return _client;
@@ -1164,7 +1164,7 @@ bool HTTPClient::connect(void)
         return false;
     }
 
-    // set Timeout for WiFiClient and for Stream::readBytesUntil() and Stream::readStringUntil()
+    // set Timeout for NetworkClient and for Stream::readBytesUntil() and Stream::readStringUntil()
     _client->setTimeout(_tcpTimeout);	
 
     log_d(" connected to %s:%u", _host.c_str(), _port);