WiFi: Cleanup libraries and error handling

Author: facchinm

libraries/WiFi/src/WiFiClient.cpp

@@ -33,6 +33,7 @@ void arduino::WiFiClient::getStatus() {
     if (ret < 0 && ret != NSAPI_ERROR_WOULD_BLOCK) {
         _status = false;
     }
+    _status = true;
 }
 
 int arduino::WiFiClient::connect(SocketAddress socketAddress) {
@@ -111,14 +112,14 @@ int arduino::WiFiClient::connectSSL(const char *host, uint16_t port) {
 
 size_t arduino::WiFiClient::write(uint8_t c) {
 	if (sock == nullptr)
-		return -1;
+		return 0;
 	auto ret = sock->send(&c, 1);
 	return ret;
 }
 
 size_t arduino::WiFiClient::write(const uint8_t *buf, size_t size) {
 	if (sock == nullptr)
-		return -1;
+		return 0;
 
 	auto ret = sock->send(buf, size);
 	return ret;

libraries/WiFi/src/WiFiClient.h

@@ -33,7 +33,7 @@ class WiFiClient : public arduino::Client {
 
 public:
   WiFiClient();
-  ~WiFiClient() {
+  virtual ~WiFiClient() {
     stop();
   }
 

libraries/WiFi/src/WiFiSSLClient.h

@@ -30,6 +30,9 @@ class WiFiSSLClient : public arduino::WiFiClient {
 
 public:
   WiFiSSLClient();
+  virtual ~WiFiSSLClient() {
+    stop();
+  }
 
   int connect(IPAddress ip, uint16_t port) {
     return connectSSL(ip, port);

libraries/WiFi/src/WiFiServer.cpp

@@ -16,25 +16,38 @@ uint8_t arduino::WiFiServer::status() {
 }
 
 void arduino::WiFiServer::begin() {
-	if (sock == NULL) {
+	if (sock == nullptr) {
 		sock = new TCPSocket();
 		((TCPSocket*)sock)->open(WiFi.getNetwork());
 	}
-	sock->bind(_port);
-	sock->listen(5);
+	if (sock) {
+		sock->bind(_port);
+		sock->listen(5);
+	}
 }
 
 size_t arduino::WiFiServer::write(uint8_t c) {
-	sock->send(&c, 1);
+	if (sock) {
+		sock->send(&c, 1);
+		return 1;
+	}
+	return 0;
 }
 
 size_t arduino::WiFiServer::write(const uint8_t *buf, size_t size) {
-	sock->send(buf, size);
+	if (sock) {
+		sock->send(buf, size);
+		return size;
+	}
+	return 0;
 }
 
 arduino::WiFiClient arduino::WiFiServer::available(uint8_t* status) {
 	WiFiClient client;
 	nsapi_error_t error;
+	if (sock == nullptr) {
+		return client;
+	}
 	TCPSocket* clientSocket = sock->accept(&error);
 	if(status != nullptr) {
 		*status = error == NSAPI_ERROR_OK ? 1 : 0;

libraries/WiFi/src/WiFiServer.h

@@ -31,9 +31,15 @@ class WiFiClient;
 class WiFiServer : public arduino::Server {
 private:
   uint16_t _port;
-  TCPSocket* sock;
+  TCPSocket* sock = nullptr;
 public:
   WiFiServer(uint16_t);
+  virtual ~WiFiServer() {
+    if (sock) {
+      delete sock;
+      sock = nullptr;
+    }
+  }
   arduino::WiFiClient available(uint8_t* status = NULL);
   void begin();
   virtual size_t write(uint8_t);