X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws.c;h=1db9ad5445dd0417bb520b1fa0c611e9d32a408a;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=b157a49f5ba12855c2f7b2e5a89ad99857491c68;hpb=cabdbd5f266d4298558cac42034e6392b449d16d;p=src%2Fapp-framework-binder.git diff --git a/src/afb-ws.c b/src/afb-ws.c index b157a49f..1db9ad54 100644 --- a/src/afb-ws.c +++ b/src/afb-ws.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 "IoT.bzh" + * Copyright (C) 2015-2020 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,12 +26,9 @@ #include #include -#include - #include "websock.h" #include "afb-ws.h" - -#include "afb-common.h" +#include "fdev.h" /* * declaration of the websock interface for afb-ws @@ -89,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 */ }; @@ -99,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. @@ -113,23 +120,22 @@ 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); } /* @@ -141,12 +147,11 @@ static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, voi * * Returns the handle for the afb_ws created or NULL on error. */ -struct afb_ws *afb_ws_create(struct sd_event *eloop, 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); @@ -154,7 +159,8 @@ struct afb_ws *afb_ws_create(struct sd_event *eloop, int fd, const struct afb_ws goto error; /* init */ - result->fd = fd; + result->fdev = fdev; + result->fd = fdev_fd(fdev); result->state = waiting; result->itf = itf; result->closure = closure; @@ -166,19 +172,15 @@ struct afb_ws *afb_ws_create(struct sd_event *eloop, int fd, const struct afb_ws if (result->ws == NULL) goto error2; - /* 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; - } + /* 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; } @@ -337,21 +339,58 @@ int afb_ws_binary_v(struct afb_ws *ws, const struct iovec *iovec, int count) */ static ssize_t aws_writev(struct afb_ws *ws, const struct iovec *iov, int iovcnt) { - ssize_t 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, iov, iovcnt); - if (rc == -1) { + rc = writev(ws->fd, iov2, iovcnt); + if (rc < 0) { if (errno == EINTR) continue; - else if (errno == EAGAIN) { - struct pollfd pfd; - pfd.fd = ws->fd; - pfd.events = POLLOUT; - poll(&pfd, 1, 10); - 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; } - return rc; + pfd.fd = ws->fd; + pfd.events = POLLOUT; + poll(&pfd, 1, 10); } } @@ -395,12 +434,12 @@ static int aws_read(struct afb_ws *ws, size_t size) 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; - do { + while (size != 0) { sz = websock_read(ws->ws, &buffer[ws->buffer.size], size); if (sz < 0) { if (errno != EAGAIN) @@ -412,7 +451,7 @@ static int aws_read(struct afb_ws *ws, size_t size) ws->buffer.size += (size_t)sz; size -= (size_t)sz; } - } while (size != 0); + } } return 1; } @@ -425,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); @@ -443,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); } @@ -462,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); } }