/*
- * 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");
struct protodef
{
const char *name;
- void *(*create)(int fd, void *context, void (*cleanup)(void*), void *cleanup_closure);
+ void *(*create)(int fd, 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)
int i;
size_t len;
+ if (protocols == NULL) {
+ /* return NULL; */
+ return protodefs != NULL && protodefs->name != NULL ? protodefs : NULL;
+ }
for(;;) {
protocols += strspn(protocols, vseparators);
if (!*protocols)
}
}
-static int check_websocket_upgrade(struct MHD_Connection *con, const struct protodef *protodefs, void *context, void **websock)
+static int check_websocket_upgrade(struct MHD_Connection *con, const struct protodef *protodefs, void *context, void **websock, struct afb_apiset *apiset)
{
const union MHD_ConnectionInfo *info;
struct MHD_Response *response;
/* is the protocol supported ? */
protocols = MHD_lookup_connection_value(con, MHD_HEADER_KIND, sec_websocket_protocol_s);
- proto = protocols == NULL ? NULL : search_proto(protodefs, protocols);
+ proto = search_proto(protodefs, protocols);
if (proto == NULL) {
response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
MHD_queue_response(con, MHD_HTTP_PRECONDITION_FAILED, response);
MHD_destroy_response(response);
return 1;
}
- ws = proto->create(info->connect_fd, context, (void*)MHD_resume_connection, con);
+ ws = proto->create(info->connect_fd, apiset, context, (void*)MHD_resume_connection, con);
if (ws == NULL) {
response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
MHD_queue_response(con, MHD_HTTP_INTERNAL_SERVER_ERROR, response);
}
static const struct protodef protodefs[] = {
- { "x-afb-ws-json1", (void*)afb_ws_json1_create },
+ { "x-afb-ws-json1", afb_ws_json1_create },
{ NULL, NULL }
};
-int afb_websock_check_upgrade(struct afb_hreq *hreq)
+int afb_websock_check_upgrade(struct afb_hreq *hreq, struct afb_apiset *apiset)
{
void *ws;
int rc;
return 0;
ws = NULL;
- rc = check_websocket_upgrade(hreq->connection, protodefs, hreq->context.session, &ws);
+ rc = check_websocket_upgrade(hreq->connection, protodefs, &hreq->xreq.context, &ws, apiset);
if (rc == 1) {
hreq->replied = 1;
if (ws != NULL)