/*
- * Copyright 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");
#include <errno.h>
#include <sys/uio.h>
#include <string.h>
+#include <stdarg.h>
+#include <poll.h>
+
+#include <systemd/sd-event.h>
#include "websock.h"
#include "afb-ws.h"
-#include "utils-upoll.h"
+#include "afb-common.h"
/*
* declaration of the websock interface for afb-ws
const struct afb_ws_itf *itf; /* the callback interface */
void *closure; /* closure when calling the callbacks */
struct websock *ws; /* the websock handler */
- struct upoll *up; /* the upoll handler for the socket */
+ sd_event_source *evsrc; /* the event source for the socket */
struct buf buffer; /* the last read fragment */
};
struct websock *wsi = ws->ws;
if (wsi != NULL) {
ws->ws = NULL;
- upoll_close(ws->up);
- ws->up = NULL;
+ sd_event_source_unref(ws->evsrc);
+ ws->evsrc = NULL;
websock_destroy(wsi);
free(aws_pick_buffer(ws).buffer);
ws->state = waiting;
}
}
+static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *ws)
+{
+ if ((revents & EPOLLIN) != 0)
+ aws_on_readable(ws);
+ if ((revents & EPOLLHUP) != 0)
+ afb_ws_hangup(ws);
+ return 0;
+}
+
/*
* 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;
assert(fd >= 0);
if (result->ws == NULL)
goto error2;
- /* creates the upoll */
- result->up = upoll_open(result->fd, result);
- if (result->up == NULL)
+ /* creates the evsrc */
+ rc = sd_event_add_io(eloop, &result->evsrc, result->fd, EPOLLIN, io_event_callback, result);
+ if (rc < 0) {
+ errno = -rc;
goto error3;
-
- /* init the upoll */
- upoll_on_readable(result->up, (void*)aws_on_readable);
- upoll_on_hangup(result->up, (void*)afb_ws_hangup);
-
+ }
return result;
error3:
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
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.
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;
+ }
}
/*
*/
static int aws_read(struct afb_ws *ws, size_t size)
{
+ struct pollfd pfd;
ssize_t sz;
char *buffer;
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;
}
}
-
Code Review / src / app-framework-binder.git / blobdiff