Fix bug in websocket on empty packets

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

diff --git a/src/afb-ws.c b/src/afb-ws.c
index cc852b2..6d48887 100644 (file)
--- a/src/afb-ws.c
+++ b/src/afb-ws.c
@@ -395,24 +395,24 @@ static int aws_read(struct afb_ws *ws, size_t size)
        ssize_t sz;
        char *buffer;
 
-       if (size != 0) {
+       if (size != 0 || ws->buffer.buffer == NULL) {
                buffer = realloc(ws->buffer.buffer, ws->buffer.size + size + 1);
                if (buffer == NULL)
                        return 0;
                ws->buffer.buffer = buffer;
-               do {
+               while (size != 0) {
                        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);
+                               poll(&pfd, 1, 10); /* TODO: make fully asynchronous websockets */
                        } else {
                                ws->buffer.size += (size_t)sz;
                                size -= (size_t)sz;
                        }
-               } while (size != 0);
+               }
        }
        return 1;
 }
@@ -498,7 +498,7 @@ static void aws_on_binary(struct afb_ws *ws, int last, size_t size)
 }
 
 /*
- * Callback when 'close' command received from 'ws' with 'code' and 'size'.
+ * Callback when 'continue' command received from 'ws' with 'code' and 'size'.
  */
 static void aws_on_continue(struct afb_ws *ws, int last, size_t size)
 {