Revision 8:860d3b8e21f9, committed 2017-06-15

Comitter:

dgriffin65

Date:

Thu Jun 15 20:18:14 2017 +0000

Parent:

7:4567996414a5

Commit message:

Updated to mbed-os

Changed in this revision

diff -r 4567996414a5 -r 860d3b8e21f9 Websocket.cpp
--- a/Websocket.cpp	Fri Feb 08 12:33:04 2013 +0000
+++ b/Websocket.cpp	Thu Jun 15 20:18:14 2017 +0000
@@ -1,10 +1,11 @@
 #include "Websocket.h"
+#include "DNSClient.h"
 
 #define MAX_TRY_WRITE 20
 #define MAX_TRY_READ 10
 
 //Debug is disabled by default
-#if 0
+#if 1
 #define DBG(x, ...) std::printf("[WebSocket : DBG]"x"\r\n", ##__VA_ARGS__); 
 #define WARN(x, ...) std::printf("[WebSocket : WARN]"x"\r\n", ##__VA_ARGS__); 
 #define ERR(x, ...) std::printf("[WebSocket : ERR]"x"\r\n", ##__VA_ARGS__); 
@@ -16,9 +17,12 @@
 
 #define INFO(x, ...) printf("[WebSocket : INFO]"x"\r\n", ##__VA_ARGS__); 
 
-Websocket::Websocket(char * url) {
+Websocket::Websocket(NetworkStack *ns, char * url) {
+    m_ns = ns;
     fillFields(url);
-    socket.set_blocking(false, 400);
+    socket.open(ns);
+    socket.set_blocking(false);
+    socket.set_timeout(400);
 }
 
 void Websocket::fillFields(char * url) {
@@ -115,13 +119,24 @@
 
 
 bool Websocket::connect() {
+    DNSClient dns(m_ns);
     char cmd[200];
-
-    while (socket.connect(host, port) < 0) {
-        ERR("Unable to connect to (%s) on port (%d)", host, port);
+    
+    if (!dns.lookup(host)) {
+        ERR("Websocket: Unable to resolve hostname (%s)", host);
         wait(0.2);
+        connected = false;
         return false;
     }
+    
+    while (socket.connect(dns.get_ip_address(), port) < 0) {
+        ERR("Websocket: Unable to connect to (%s) on port (%d)", host, port);
+        wait(0.2);
+        connected = false;
+        return false;
+    }
+    
+    connected = true;
 
     // sent http header to upgrade to the ws protocol
     sprintf(cmd, "GET %s HTTP/1.1\r\n", path);
@@ -240,19 +255,22 @@
             return false;
         }
         
-        if(!socket.is_connected())
+        if(!connected)
         {
             WARN("Connection was closed by server");
             return false;
         }
 
-        socket.set_blocking(false, 1);
-        if (socket.receive(&opcode, 1) != 1) {
-            socket.set_blocking(false, 2000);
+        socket.set_blocking(false);
+        socket.set_timeout(1);
+        if (socket.recv(&opcode, 1) != 1) {
+            socket.set_blocking(false);
+            socket.set_timeout(2000);
             return false;
         }
 
-        socket.set_blocking(false, 2000);
+        socket.set_blocking(false);
+        socket.set_timeout(2000);
 
         if (opcode == 0x81)
             break;
@@ -312,7 +330,7 @@
 }
 
 bool Websocket::is_connected() {
-    return socket.is_connected();
+    return connected;
 }
 
 char* Websocket::getPath() {
@@ -324,13 +342,13 @@
     
     for (int j = 0; j < MAX_TRY_WRITE; j++) {
     
-        if(!socket.is_connected())
+        if(!connected)
         {
             WARN("Connection was closed by server");
             break;
         }
 
-        if ((res = socket.send_all(str + idx, len - idx)) == -1)
+        if ((res = socket.send(str + idx, len - idx)) == -1)
             continue;
 
         idx += res;
@@ -347,7 +365,7 @@
     
     for (int j = 0; j < MAX_TRY_WRITE; j++) {
 
-        if ((res = socket.receive_all(str + idx, len - idx)) == -1)
+        if ((res = socket.recv(str + idx, len - idx)) == -1)
             continue;
 
         idx += res;

diff -r 4567996414a5 -r 860d3b8e21f9 Websocket.h
--- a/Websocket.h	Fri Feb 08 12:33:04 2013 +0000
+++ b/Websocket.h	Thu Jun 15 20:18:14 2017 +0000
@@ -33,8 +33,6 @@
 
 #include "mbed.h"
 
-#include "TCPSocketConnection.h"
-
 /** Websocket client Class.
  *
  * Example (ethernet network):
@@ -73,7 +71,7 @@
         *
         * @param url The Websocket url in the form "ws://ip_domain[:port]/path" (by default: port = 80)
         */
-        Websocket(char * url);
+        Websocket(NetworkStack *ns, char * url);
 
         /**
         * Connect to the websocket url
@@ -134,8 +132,10 @@
         uint16_t port;
         char host[32];
         char path[64];
+        bool connected;
         
-        TCPSocketConnection socket;
+        TCPSocket socket;
+        NetworkStack *m_ns;
 
         int read(char * buf, int len, int min_len = -1);
         int write(char * buf, int len);