X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws.c;h=ff625fca3a0f3390d4e280670c775b52b8620b9a;hb=1430e5aca4864a093534a0c91f056a97a4a26056;hp=53fb60ae4c4ab30c42228e65af3a2de2736a3c5f;hpb=1ea6bd0f466a10d29f12801aa35fb6d2b30443a1;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws.c b/src/afb-ws.c
index 53fb60ae..ff625fca 100644
--- 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>
 
@@ -98,11 +99,21 @@ struct afb_ws
 static inline struct buf aws_pick_buffer(struct afb_ws *ws)
 {
 	struct buf result = ws->buffer;
+	if (result.buffer)
+		result.buffer[result.size] = 0;
 	ws->buffer.buffer = NULL;
 	ws->buffer.size = 0;
 	return result;
 }
 
+/*
+ * Clear the current buffer
+ */
+static inline void aws_clear_buffer(struct afb_ws *ws)
+{
+	ws->buffer.size = 0;
+}
+
 /*
  * Disconnect the websocket 'ws' and calls on_hangup if
  * 'call_on_hangup' is not null.
@@ -115,7 +126,7 @@ static void aws_disconnect(struct afb_ws *ws, int call_on_hangup)
 		sd_event_source_unref(ws->evsrc);
 		ws->evsrc = NULL;
 		websock_destroy(wsi);
-		free(aws_pick_buffer(ws).buffer);
+		free(ws->buffer.buffer);
 		ws->state = waiting;
 		if (call_on_hangup && ws->itf->on_hangup)
 			ws->itf->on_hangup(ws->closure);
@@ -200,6 +211,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 +300,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 +328,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 +389,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,18 +401,28 @@ 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;
 
-	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;
-		sz = websock_read(ws->ws, &buffer[ws->buffer.size], size);
-		if ((size_t)sz != size)
-			return 0;
-		ws->buffer.size += size;
+		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); /* TODO: make fully asynchronous websockets */
+			} else {
+				ws->buffer.size += (size_t)sz;
+				size -= (size_t)sz;
+			}
+		}
 	}
 	return 1;
 }
@@ -367,7 +435,7 @@ static void aws_on_close(struct afb_ws *ws, uint16_t code, size_t size)
 	struct buf b;
 
 	ws->state = waiting;
-	free(aws_pick_buffer(ws).buffer);
+	aws_clear_buffer(ws);
 	if (ws->itf->on_close == NULL) {
 		websock_drop(ws->ws);
 		afb_ws_hangup(ws);
@@ -385,7 +453,7 @@ static void aws_on_close(struct afb_ws *ws, uint16_t code, size_t size)
 static void aws_drop_error(struct afb_ws *ws, uint16_t code)
 {
 	ws->state = waiting;
-	free(aws_pick_buffer(ws).buffer);
+	aws_clear_buffer(ws);
 	websock_drop(ws->ws);
 	websock_error(ws->ws, code, NULL, 0);
 }
@@ -404,7 +472,6 @@ static void aws_continue(struct afb_ws *ws, int last, size_t size)
 		istxt = ws->state == reading_text;
 		ws->state = waiting;
 		b = aws_pick_buffer(ws);
-		b.buffer[b.size] = 0;
 		(istxt ? ws->itf->on_text : ws->itf->on_binary)(ws->closure, b.buffer, b.size);
 	}
 }
@@ -440,7 +507,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)
 {