diff options
author | José Bollo <jose.bollo@iot.bzh> | 2016-05-10 13:47:58 +0200 |
---|---|---|
committer | José Bollo <jose.bollo@iot.bzh> | 2016-05-10 13:47:58 +0200 |
commit | f1b901ed676b2d45ec8e6ae3d6ef2f94d79f9ee6 (patch) | |
tree | ea91e3f7485736acdd6aa83ffc6e0ff60f326577 /src/afb-hswitch.c | |
parent | 19fb390ec60890d55bafe7a4c887b1453509f7ef (diff) |
Refactoring requests and context handling
Also adds a first (untested) implmentation of
the afb services over dbus.
Change-Id: Id1bdeccf75f3a70d3658bdaf0510d6e7b97f6c32
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-hswitch.c')
-rw-r--r-- | src/afb-hswitch.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c index 606d2664..f0308455 100644 --- a/src/afb-hswitch.c +++ b/src/afb-hswitch.c @@ -21,7 +21,10 @@ #include <stdlib.h> #include <string.h> +#include <microhttpd.h> + #include "afb-req-itf.h" +#include "afb-context.h" #include "afb-hreq.h" #include "afb-apis.h" #include "session.h" @@ -31,7 +34,6 @@ int afb_hswitch_apis(struct afb_hreq *hreq, void *data) { const char *api, *verb; size_t lenapi, lenverb; - struct AFB_clientCtx *context; api = &hreq->tail[strspn(hreq->tail, "/")]; lenapi = strcspn(api, "/"); @@ -42,8 +44,10 @@ int afb_hswitch_apis(struct afb_hreq *hreq, void *data) if (!(*api && *verb && lenapi && lenverb)) return 0; - context = afb_hreq_context(hreq); - afb_apis_call(afb_hreq_to_req(hreq), context, api, lenapi, verb, lenverb); + if (afb_hreq_init_context(hreq) < 0) + afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR); + else + afb_apis_call(afb_hreq_to_req(hreq), &hreq->context, api, lenapi, verb, lenverb); return 1; } @@ -77,7 +81,12 @@ int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data) if (hreq->lentail != 0) return 0; - return afb_websock_check_upgrade(hreq /* TODO: protocols here */); + if (afb_hreq_init_context(hreq) < 0) { + afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR); + return 1; + } + + return afb_websock_check_upgrade(hreq); } |