X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws.c;h=c25c3f108a173f62edf79222c6099057e1625978;hb=c94e1ef88adc641ebbab57377b97f8a7b6a70d1b;hp=347968185390f04fa5aa4fed844eb849e674dd5a;hpb=c7e9786d408f13d8f8f43c6b68da916bbb1ed5f3;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws.c b/src/afb-ws.c
index 34796818..c25c3f10 100644
--- a/src/afb-ws.c
+++ b/src/afb-ws.c
@@ -135,10 +135,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;
@@ -164,7 +166,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;
@@ -198,6 +200,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 +289,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,6 +317,20 @@ 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
  */