afb-client-demo/afb-ws: remove dependency on afb-common.*

[src/app-framework-binder.git] / src / afb-ws-client.c

diff --git a/src/afb-ws-client.c b/src/afb-ws-client.c
index 32f8778..de44a39 100644 (file)
--- a/src/afb-ws-client.c
+++ b/src/afb-ws-client.c
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 
 #include "afb-wsj1.h"
+#include "afb-common.h"
 
 /**************** WebSocket handshake ****************************/
 
@@ -111,7 +112,7 @@ static char *strjoin(int count, const char **strings, const char *separ)
 /* creates the http message for the request */
 static int make_request(char **request, const char *path, const char *host, const char *key, const char *protocols)
 {
-       int rc = asprintf(request, 
+       int rc = asprintf(request,
                        "GET %s HTTP/1.1\r\n"
                        "Host: %s\r\n"
                        "Upgrade: websocket\r\n"
@@ -201,15 +202,15 @@ static int receive_response(int fd, const char **protocols, const char *ack)
                goto error;
        len = strcspn(line, " ");
        if (len != 8 || 0 != strncmp(line, "HTTP/1.1", 8))
-               goto error;
+               goto abort;
        it = line + len;
        len = strspn(it, " ");
        if (len == 0)
-               goto error;
+               goto abort;
        it += len;
        len = strcspn(it, " ");
        if (len != 3 || 0 != strncmp(it, "101", 3))
-               goto error;
+               goto abort;
 
        /* reads the rest of the response until empty line */
        clen = 0;
@@ -250,15 +251,13 @@ static int receive_response(int fd, const char **protocols, const char *ack)
        if (clen > 0) {
                while (read(fd, line, len) < 0 && errno == EINTR);
        }
-       if (haserr != 0)
-               result = -1;
-       else if (result < 0) {
-               result = 0;
-               while(protocols[result] != NULL)
-                       result++;
-       }
-error:
+       if (haserr != 0 || result < 0)
+               goto abort;
        return result;
+abort:
+       errno = ECONNABORTED;
+error:
+       return -1;
 }
 
 static int negociate(int fd, const char **protocols, const char *path, const char *host)
@@ -316,7 +315,7 @@ invalid:
        errno = EINVAL;
 error:
        return -1;
-       
+
 }
 
 
@@ -408,4 +407,15 @@ static char *makequery(const char *path, const char *uuid, const char *token)
 }
 #endif
 
+/*
+ *
+ * Returns the internal event loop coming from afb-common
+ *
+ * Returns the handle to the event loop
+ */
+struct sd_event *afb_ws_client_get_event_loop()
+{
+       return afb_common_get_event_loop();
+}
+