Fix SSL client and available()

Author: facchinm

libraries/WiFi/src/WiFi.h

@@ -27,6 +27,7 @@ extern "C" {
 #include "Arduino.h"
 #include "api/IPAddress.h"
 #include "WiFiClient.h"
+//#include "WiFiSSLClient.h"
 #include "WiFiServer.h"
 #include "WiFiUdp.h"
 

libraries/WiFi/src/WiFiClient.cpp

@@ -34,8 +34,8 @@ int arduino::WiFiClient::connect(const char *host, uint16_t port) {
 	}
 	//sock->sigio(mbed::callback(this, &WiFiClient::getStatus));
 	//sock->set_blocking(false);
-	sock->set_timeout(5000);
-	int ret = sock->connect(host, port);
+	sock->set_timeout(1000);
+	int ret = ((TCPSocket*)sock)->connect(host, port);
 	if (ret == 0) {
 		return 1;
 	} else {
@@ -44,12 +44,22 @@ int arduino::WiFiClient::connect(const char *host, uint16_t port) {
 }
 
 int arduino::WiFiClient::connectSSL(IPAddress ip, uint16_t port) {
-
 }
 
 int arduino::WiFiClient::connectSSL(const char *host, uint16_t port) {
-	sock_ssl->open(WiFi.getNetwork());
-	sock_ssl->connect(host, port);
+	if (sock == NULL) {
+		sock = new TLSSocket(WiFi.getNetwork());
+	}
+	if (beforeConnect) {
+		beforeConnect();
+	}
+	sock->set_timeout(1000);
+	int ret = ((TLSSocket*)sock)->connect(host, port);
+	if (ret == 0) {
+		return 1;
+	} else {
+		return 0;
+	}
 }
 
 size_t arduino::WiFiClient::write(uint8_t c) {
@@ -61,7 +71,9 @@ size_t arduino::WiFiClient::write(const uint8_t *buf, size_t size) {
 }
 
 int arduino::WiFiClient::available() {
-	getStatus();
+	if (rxBuffer.available() == 0) {
+		getStatus();
+	}
     return rxBuffer.available();
 }
 

libraries/WiFi/src/WiFiClient.h

@@ -35,36 +35,43 @@ class WiFiClient : public arduino::Client {
   WiFiClient();
 
   uint8_t status();
-  virtual int connect(IPAddress ip, uint16_t port);
-  virtual int connect(const char *host, uint16_t port);
-  virtual int connectSSL(IPAddress ip, uint16_t port);
-  virtual int connectSSL(const char *host, uint16_t port);
-  virtual size_t write(uint8_t);
-  virtual size_t write(const uint8_t *buf, size_t size);
-  virtual int available();
-  virtual int read();
-  virtual int read(uint8_t *buf, size_t size);
-  virtual int peek();
-  virtual void flush();
-  virtual void stop();
-  virtual uint8_t connected();
-  virtual operator bool() {
+  int connect(IPAddress ip, uint16_t port);
+  int connect(const char *host, uint16_t port);
+  int connectSSL(IPAddress ip, uint16_t port);
+  int connectSSL(const char *host, uint16_t port);
+  size_t write(uint8_t);
+  size_t write(const uint8_t *buf, size_t size);
+  int available();
+  int read();
+  int read(uint8_t *buf, size_t size);
+  int peek();
+  void flush();
+  void stop();
+  uint8_t connected();
+  operator bool() {
     return sock != NULL;
   }
 
-  virtual IPAddress remoteIP();
-  virtual uint16_t remotePort();
+  IPAddress remoteIP();
+  uint16_t remotePort();
 
   friend class WiFiServer;
+  friend class WiFiSSLClient;
 
   using Print::write;
 
+protected:
+
+  void onBeforeConnect(mbed::Callback<int(void)> cb) {
+    beforeConnect = cb;
+  }
+
 private:
   static uint16_t _srcport;
-  TCPSocket* sock;
-  TLSSocket* sock_ssl;
+  Socket* sock;
   RingBufferN<256> rxBuffer;
   uint8_t _status;
+  mbed::Callback<int(void)> beforeConnect;
 
   void getStatus();
 };

libraries/WiFi/src/WiFiSSLClient.cpp

@@ -0,0 +1,5 @@
+#include "WiFiSSLClient.h"
+
+arduino::WiFiSSLClient::WiFiSSLClient() {
+    onBeforeConnect(mbed::callback(this, &WiFiSSLClient::setRootCA));
+};

libraries/WiFi/src/WiFiSSLClient.h

@@ -22,16 +22,26 @@
 
 #include "WiFiClient.h"
 
+extern const char CA_CERTIFICATES[];
+
 namespace arduino {
 
 class WiFiSSLClient : public arduino::WiFiClient {
 
 public:
-	WiFiSSLClient();
-	WiFiSSLClient(uint8_t sock);
-
-	virtual int connect(IPAddress ip, uint16_t port);
-	virtual int connect(const char* host, uint16_t port);
+  WiFiSSLClient();
+
+  int connect(IPAddress ip, uint16_t port) {
+    return connectSSL(ip, port);
+  }
+  int connect(const char* host, uint16_t port) {
+    return connectSSL(host, port);
+  }
+
+private:
+  int setRootCA() {
+    return ((TLSSocket*)sock)->set_root_ca_cert(CA_CERTIFICATES);
+  }
 };
 
 }