X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws.c;h=d159c28ab66df719eaac7ab21124a92a69dbe0cb;hb=a6401ca78446610ffadb7b63c90937caa47d065a;hp=d0cfc8a8bb0a10fe7f32415511fcd6164c756d35;hpb=5dd6480727cc1ecb12483fc4d971d73176505748;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws.c b/src/afb-ws.c
index d0cfc8a8..d159c28a 100644
--- a/src/afb-ws.c
+++ b/src/afb-ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +23,8 @@
 #include <errno.h>
 #include <sys/uio.h>
 #include <string.h>
+#include <stdarg.h>
+#include <poll.h>
 
 #include <systemd/sd-event.h>
 
@@ -134,10 +136,12 @@ static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, voi
  * Creates the afb_ws structure for the file descritor
  * 'fd' and the callbacks described by the interface 'itf'
  * and its 'closure'.
+ * When the creation is a success, the systemd event loop 'eloop' is
+ * used for handling event for 'fd'.
  *
  * Returns the handle for the afb_ws created or NULL on error.
  */
-struct afb_ws *afb_ws_create(int fd, const struct afb_ws_itf *itf, void *closure)
+struct afb_ws *afb_ws_create(struct sd_event *eloop, int fd, const struct afb_ws_itf *itf, void *closure)
 {
 	int rc;
 	struct afb_ws *result;
@@ -163,7 +167,7 @@ struct afb_ws *afb_ws_create(int fd, const struct afb_ws_itf *itf, void *closure
 		goto error2;
 
 	/* creates the evsrc */
-	rc = sd_event_add_io(afb_common_get_event_loop(), &result->evsrc, result->fd, EPOLLIN, io_event_callback, result);
+	rc = sd_event_add_io(eloop, &result->evsrc, result->fd, EPOLLIN, io_event_callback, result);
 	if (rc < 0) {
 		errno = -rc;
 		goto error3;
@@ -197,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
@@ -244,6 +256,54 @@ int afb_ws_text(struct afb_ws *ws, const char *text, size_t length)
 	return websock_text(ws->ws, 1, text, length);
 }
 
+/*
+ * Sends a variable list of texts to the endpoint of 'ws'.
+ * Returns 0 on success or -1 in case of error.
+ */
+int afb_ws_texts(struct afb_ws *ws, ...)
+{
+	va_list args;
+	struct iovec ios[32];
+	int count;
+	const char *s;
+
+	if (ws->ws == NULL) {
+		/* disconnected */
+		errno = EPIPE;
+		return -1;
+	}
+
+	count = 0;
+	va_start(args, ws);
+	s = va_arg(args, const char *);
+	while (s != NULL) {
+		if (count == 32) {
+			errno = EINVAL;
+			return -1;
+		}
+		ios[count].iov_base = (void*)s;
+		ios[count].iov_len = strlen(s);
+		count++;
+		s = va_arg(args, const char *);
+	}
+	va_end(args);
+	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.
@@ -258,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;
+	}
 }
 
 /*
@@ -306,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;
 
@@ -314,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;
 }
@@ -425,4 +520,3 @@ static void aws_on_error(struct afb_ws *ws, uint16_t code, const void *data, siz
 }
 
 
-