X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws.c;h=1db9ad5445dd0417bb520b1fa0c611e9d32a408a;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=22d969149d11a7a81ec2c978dfeea9b04f568d49;hpb=146f95b776c7a424e672b27386fbb8392bc0ffb7;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws.c b/src/afb-ws.c
index 22d96914..1db9ad54 100644
--- a/src/afb-ws.c
+++ b/src/afb-ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,13 +24,11 @@
 #include <sys/uio.h>
 #include <string.h>
 #include <stdarg.h>
-
-#include <systemd/sd-event.h>
+#include <poll.h>
 
 #include "websock.h"
 #include "afb-ws.h"
-
-#include "afb-common.h"
+#include "fdev.h"
 
 /*
  * declaration of the websock interface for afb-ws
@@ -88,7 +86,7 @@ struct afb_ws
 	const struct afb_ws_itf *itf; /* the callback interface */
 	void *closure;		/* closure when calling the callbacks */
 	struct websock *ws;	/* the websock handler */
-	sd_event_source *evsrc;	/* the event source for the socket */
+	struct fdev *fdev;	/* the fdev for the socket */
 	struct buf buffer;	/* the last read fragment */
 };
 
@@ -98,11 +96,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.
@@ -112,38 +120,38 @@ static void aws_disconnect(struct afb_ws *ws, int call_on_hangup)
 	struct websock *wsi = ws->ws;
 	if (wsi != NULL) {
 		ws->ws = NULL;
-		sd_event_source_unref(ws->evsrc);
-		ws->evsrc = NULL;
+		fdev_set_callback(ws->fdev, NULL, 0);
+		fdev_unref(ws->fdev);
 		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);
 	}
 }
 
-static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *ws)
+static void fdevcb(void *ws, uint32_t revents, struct fdev *fdev)
 {
-	if ((revents & EPOLLIN) != 0)
-		aws_on_readable(ws);
 	if ((revents & EPOLLHUP) != 0)
 		afb_ws_hangup(ws);
-	return 0;
+	else if ((revents & EPOLLIN) != 0)
+		aws_on_readable(ws);
 }
 
 /*
  * 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 fdev *fdev, const struct afb_ws_itf *itf, void *closure)
 {
-	int rc;
 	struct afb_ws *result;
 
-	assert(fd >= 0);
+	assert(fdev);
 
 	/* allocation */
 	result = malloc(sizeof * result);
@@ -151,7 +159,8 @@ struct afb_ws *afb_ws_create(int fd, const struct afb_ws_itf *itf, void *closure
 		goto error;
 
 	/* init */
-	result->fd = fd;
+	result->fdev = fdev;
+	result->fd = fdev_fd(fdev);
 	result->state = waiting;
 	result->itf = itf;
 	result->closure = closure;
@@ -163,19 +172,15 @@ struct afb_ws *afb_ws_create(int fd, const struct afb_ws_itf *itf, void *closure
 	if (result->ws == NULL)
 		goto error2;
 
-	/* creates the evsrc */
-	rc = sd_event_add_io(afb_common_get_event_loop(), &result->evsrc, result->fd, EPOLLIN, io_event_callback, result);
-	if (rc < 0) {
-		errno = -rc;
-		goto error3;
-	}
+	/* finalize */
+	fdev_set_events(fdev, EPOLLIN);
+	fdev_set_callback(fdev, fdevcb, result);
 	return result;
 
-error3:
-	websock_destroy(result->ws);
 error2:
 	free(result);
 error:
+	fdev_unref(fdev);
 	return NULL;
 }
 
@@ -198,6 +203,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
@@ -279,6 +292,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.
@@ -293,16 +320,78 @@ 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 {
-		rc = writev(ws->fd, iov, iovcnt);
-	} while(rc == -1 && errno == EINTR);
-	return rc;
+	int i;
+	ssize_t rc, sz, dsz;
+	struct iovec *iov2;
+	struct pollfd pfd;
+
+	/* compute the size */
+	dsz = 0;
+	i = 0;
+	while (i < iovcnt) {
+		dsz += iov[i++].iov_len;
+		if (dsz < 0) {
+			errno = EINVAL;
+			return -1;
+		}
+	}
+	if (dsz == 0)
+		return 0;
+
+	/* write the data */
+	iov2 = (struct iovec*)iov;
+	sz = dsz;
+	for (;;) {
+		rc = writev(ws->fd, iov2, iovcnt);
+		if (rc < 0) {
+			if (errno == EINTR)
+				continue;
+			if (errno != EAGAIN)
+				return -1;
+		} else {
+			dsz -= rc;
+			if (dsz == 0)
+				return sz;
+
+			i = 0;
+			while (rc >= (ssize_t)iov2[i].iov_len)
+				rc -= (ssize_t)iov2[i++].iov_len;
+
+			iovcnt -= i;
+			if (iov2 != iov)
+				iov2 += i;
+			else {
+				iov += i;
+				iov2 = alloca(iovcnt * sizeof *iov2);
+				for (i = 0 ; i < iovcnt ; i++)
+					iov2[i] = iov[i];
+			}
+			iov2->iov_base += rc;
+			iov2->iov_len -= rc;
+		}
+		pfd.fd = ws->fd;
+		pfd.events = POLLOUT;
+		poll(&pfd, 1, 10);
+	}
 }
 
 /*
@@ -329,7 +418,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);
 }
@@ -341,18 +430,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;
 }
@@ -365,7 +464,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);
@@ -383,7 +482,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);
 }
@@ -402,7 +501,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);
 	}
 }
@@ -438,7 +536,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)
 {