SocketWrapper: Client: properly implement connect

Author: facchinm

libraries/SocketWrapper/SocketWrapper.h

@@ -14,10 +14,51 @@ class ZephyrSocketWrapper {
     }
 
     bool connect(const char* host, uint16_t port) {
+
+        // Resolve address
+        struct addrinfo hints;
+	    struct addrinfo *res;
+
+	    hints.ai_family = AF_INET;
+	    hints.ai_socktype = SOCK_STREAM;
+
+        int resolve_attempts = 10;
+        int ret;
+
+	    while (resolve_attempts--) {
+            ret = getaddrinfo(host, String(port).c_str(), &hints, &res);
+
+            if (ret == 0) {
+                break;
+            }
+        }
+
+	    if (ret != 0) {
+            return false;
+        }
+
+        sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+        if (sock_fd < 0) {
+            return false;
+        }
+
+        if (::connect(sock_fd, res->ai_addr, res->ai_addrlen) < 0) {
+            ::close(sock_fd);
+            sock_fd = -1;
+            return false;
+        }
+
+        return true;
+    }
+
+    bool connect(IPAddress host, uint16_t port) {
+
+        const char* _host = host.toString().c_str();
+
         struct sockaddr_in addr;
         addr.sin_family = AF_INET;
         addr.sin_port = htons(port);
-        inet_pton(AF_INET, host, &addr.sin_addr);
+        inet_pton(AF_INET, _host, &addr.sin_addr);
 
         sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
         if (sock_fd < 0) {

libraries/SocketWrapper/ZephyrClient.h

@@ -1,14 +1,15 @@
 #include "SocketWrapper.h"
 #include "api/Client.h"
+#include "unistd.h"
 #include "zephyr/sys/printk.h"
 
 class ZephyrClient : public arduino::Client, ZephyrSocketWrapper {
 public:
     int connect(const char* host, uint16_t port) override {
-        return ZephyrSocketWrapper::connect(host, port);
+        return ZephyrSocketWrapper::connect((char*)host, port);
     }
     int connect(IPAddress ip, uint16_t port) {
-        return 0;
+        return ZephyrSocketWrapper::connect(ip, port);
     }
     uint8_t connected() override {
         return sock_fd != -1;
@@ -48,7 +49,7 @@ class ZephyrClient : public arduino::Client, ZephyrSocketWrapper {
         // No-op
     }
     void stop() override {
-        // No-op
+        ZephyrSocketWrapper::close();
     }
     operator bool() {
         return sock_fd != -1;

libraries/SocketWrapper/examples/TestClient/TestClient.ino

@@ -118,17 +118,22 @@ int _main(void)
 
 #define Serial Serial1
 
+
 ZephyrClient client;
+IPAddress addr(93,184,215,14);
 // the setup function runs once when you press reset or power the board
 void setup() {
   // initialize digital pin LED_BUILTIN as an output.
   pinMode(LED_BUILTIN, OUTPUT);
   Serial.begin(115200);
   _main();
-  delay(20000);
+  delay(5000);
   while (!Serial);
-  client.connect("93.184.215.14", 80);
-  client.println("GET / HTTP/1.0");
+  //auto res = client.connect(addr, 80);
+  auto res = client.connect("example.com", 80);
+  Serial.println(res);
+  res = client.println("GET / HTTP/1.0");
+  Serial.println(res);
   client.println("Host: example.com");
   client.println("Connection: close");
   client.println();