diff options
author | José Bollo <jose.bollo@iot.bzh> | 2018-02-22 13:22:48 +0100 |
---|---|---|
committer | José Bollo <jose.bollo@iot.bzh> | 2018-02-22 13:22:48 +0100 |
commit | ca820c65c2b03a24e8936218171c6c1d138fd1f7 (patch) | |
tree | f7e31ea8e63d3321af64226e360a78c504a09bb3 /src/afb-websock.c | |
parent | f15ea770dd9b13a20331853a026091316984f9ca (diff) |
fdev: Introduce fdev for file event handling
This is an effort to keep cutting dependency to systemd.
Change-Id: I9a0c032a1095e297c7f3ac5b67827fda3658b8d9
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-websock.c')
-rw-r--r-- | src/afb-websock.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/afb-websock.c b/src/afb-websock.c index 799b2bd0..e062cf77 100644 --- a/src/afb-websock.c +++ b/src/afb-websock.c @@ -30,6 +30,7 @@ #include "afb-hreq.h" #include "afb-websock.h" #include "afb-ws-json1.h" +#include "afb-fdev.h" /**************** WebSocket connection upgrade ****************************/ @@ -94,7 +95,7 @@ static int headerhas(const char *header, const char *needle) struct protodef { const char *name; - void *(*create)(int fd, struct afb_apiset *apiset, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure); + void *(*create)(struct fdev *fdev, struct afb_apiset *apiset, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure); }; static const struct protodef *search_proto(const struct protodef *protodefs, const char *protocols) @@ -142,11 +143,18 @@ static void upgrade_to_websocket( { struct memo_websocket *memo = cls; void *ws; + struct fdev *fdev; - ws = memo->proto->create(sock, memo->apiset, &memo->hreq->xreq.context, close_websocket, urh); - if (ws == NULL) { + fdev = afb_fdev_create(sock); + if (!fdev) { /* TODO */ close_websocket(urh); + } else { + ws = memo->proto->create(fdev, memo->apiset, &memo->hreq->xreq.context, close_websocket, urh); + if (ws == NULL) { + /* TODO */ + close_websocket(urh); + } } afb_hreq_unref(memo->hreq); free(memo); |