Websocket client select if looping or not

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

diff --git a/src/afb-ws.c b/src/afb-ws.c
index 53fb60a..cc852b2 100644 (file)
--- a/src/afb-ws.c
+++ b/src/afb-ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,7 @@
 #include <sys/uio.h>
 #include <string.h>
 #include <stdarg.h>
+#include <poll.h>
 
 #include <systemd/sd-event.h>
 
@@ -200,6 +201,14 @@ void afb_ws_hangup(struct afb_ws *ws)
        aws_disconnect(ws, 1);
 }
 
+/*
+ * Is the websocket 'ws' still connected ?
+ */
+int afb_ws_is_connected(struct afb_ws *ws)
+{
+       return ws->ws != NULL;
+}
+
 /*
  * Sends a 'close' command to the endpoint of 'ws' with the 'code' and the
  * 'reason' (that can be NULL and that else should not be greater than 123
@@ -281,6 +290,20 @@ int afb_ws_texts(struct afb_ws *ws, ...)
        return websock_text_v(ws->ws, 1, ios, count);
 }
 
+/*
+ * Sends a text data described in the 'count' 'iovec' to the endpoint of 'ws'.
+ * Returns 0 on success or -1 in case of error.
+ */
+int afb_ws_text_v(struct afb_ws *ws, const struct iovec *iovec, int count)
+{
+       if (ws->ws == NULL) {
+               /* disconnected */
+               errno = EPIPE;
+               return -1;
+       }
+       return websock_text_v(ws->ws, 1, iovec, count);
+}
+
 /*
  * Sends a binary 'data' of 'length' to the endpoint of 'ws'.
  * Returns 0 on success or -1 in case of error.
@@ -295,16 +318,41 @@ int afb_ws_binary(struct afb_ws *ws, const void *data, size_t length)
        return websock_binary(ws->ws, 1, data, length);
 }
 
+/*
+ * Sends a binary data described in the 'count' 'iovec' to the endpoint of 'ws'.
+ * Returns 0 on success or -1 in case of error.
+ */
+int afb_ws_binary_v(struct afb_ws *ws, const struct iovec *iovec, int count)
+{
+       if (ws->ws == NULL) {
+               /* disconnected */
+               errno = EPIPE;
+               return -1;
+       }
+       return websock_binary_v(ws->ws, 1, iovec, count);
+}
+
 /*
  * callback for writing data
  */
 static ssize_t aws_writev(struct afb_ws *ws, const struct iovec *iov, int iovcnt)
 {
        ssize_t rc;
-       do {
+       for (;;) {
                rc = writev(ws->fd, iov, iovcnt);
-       } while(rc == -1 && errno == EINTR);
-       return rc;
+               if (rc == -1) {
+                       if (errno == EINTR)
+                               continue;
+                       else if (errno == EAGAIN) {
+                               struct pollfd pfd;
+                               pfd.fd = ws->fd;
+                               pfd.events = POLLOUT;
+                               poll(&pfd, 1, 10);
+                               continue;
+                       }
+               }
+               return rc;
+       }
 }
 
 /*
@@ -331,7 +379,7 @@ static void aws_on_readable(struct afb_ws *ws)
        int rc;
 
        assert(ws->ws != NULL);
-       rc = websock_dispatch(ws->ws);
+       rc = websock_dispatch(ws->ws, 0);
        if (rc < 0 && errno == EPIPE)
                afb_ws_hangup(ws);
 }
@@ -343,6 +391,7 @@ static void aws_on_readable(struct afb_ws *ws)
  */
 static int aws_read(struct afb_ws *ws, size_t size)
 {
+       struct pollfd pfd;
        ssize_t sz;
        char *buffer;
 
@@ -351,10 +400,19 @@ static int aws_read(struct afb_ws *ws, size_t size)
                if (buffer == NULL)
                        return 0;
                ws->buffer.buffer = buffer;
-               sz = websock_read(ws->ws, &buffer[ws->buffer.size], size);
-               if ((size_t)sz != size)
-                       return 0;
-               ws->buffer.size += size;
+               do {
+                       sz = websock_read(ws->ws, &buffer[ws->buffer.size], size);
+                       if (sz < 0) {
+                               if (errno != EAGAIN)
+                                       return 0;
+                               pfd.fd = ws->fd;
+                               pfd.events = POLLIN;
+                               poll(&pfd, 1, 10);
+                       } else {
+                               ws->buffer.size += (size_t)sz;
+                               size -= (size_t)sz;
+                       }
+               } while (size != 0);
        }
        return 1;
 }