Fix libs

husarnet · Aug 17, 2020 · 6f2abf9 · 6f2abf9
1 parent 9f0a703
commit 6f2abf9
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 510 deletions.
diff --git a/libraries/WiFi/examples/WiFiProv/README.md b/libraries/WiFi/examples/WiFiProv/README.md
diff --git a/libraries/WiFi/examples/WiFiProv/WiFiProv.ino b/libraries/WiFi/examples/WiFiProv/WiFiProv.ino
diff --git a/libraries/WiFi/src/WiFi.h b/libraries/WiFi/src/WiFi.h
@@ -37,9 +37,8 @@
 #include "WiFiClient.h"
 #include "WiFiServer.h"
 #include "WiFiUdp.h"
-#include "WiFiProv.h"
 
-class WiFiClass : public WiFiGenericClass, public WiFiSTAClass, public WiFiScanClass, public WiFiAPClass, public WiFiProvClass
+class WiFiClass : public WiFiGenericClass, public WiFiSTAClass, public WiFiScanClass, public WiFiAPClass
 {
 public:
     using WiFiGenericClass::channel;
@@ -55,7 +54,8 @@ class WiFiClass : public WiFiGenericClass, public WiFiSTAClass, public WiFiScanC
     using WiFiScanClass::BSSID;
     using WiFiScanClass::BSSIDstr;
     using WiFiScanClass::channel;
-public:  
+
+public:
     void printDiag(Print& dest);
     friend class WiFiClient;
     friend class WiFiServer;

diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp
@@ -495,28 +495,23 @@ uint8_t WiFiClient::connected()
         int res = recv(fd(), &dummy, 0, MSG_DONTWAIT);
         // avoid unused var warning by gcc
         (void)res;
-        // recv only sets errno if res is <= 0
-        if (res <= 0){
-          switch (errno) {
-              case EWOULDBLOCK:
-              case ENOENT: //caused by vfs
-                  _connected = true;
-                  break;
-              case ENOTCONN:
-              case EPIPE:
-              case ECONNRESET:
-              case ECONNREFUSED:
-              case ECONNABORTED:
-                  _connected = false;
-                  log_d("Disconnected: RES: %d, ERR: %d", res, errno);
-                  break;
-              default:
-                  log_i("Unexpected: RES: %d, ERR: %d", res, errno);
-                  _connected = true;
-                  break;
-          }
-        } else {
-          _connected = true;
+        switch (errno) {
+            case EWOULDBLOCK:
+            case ENOENT: //caused by vfs
+                _connected = true;
+                break;
+            case ENOTCONN:
+            case EPIPE:
+            case ECONNRESET:
+            case ECONNREFUSED:
+            case ECONNABORTED:
+                _connected = false;
+                log_d("Disconnected: RES: %d, ERR: %d", res, errno);
+                break;
+            default:
+                log_i("Unexpected: RES: %d, ERR: %d", res, errno);
+                _connected = true;
+                break;
         }
     }
     return _connected;