/*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2015-2020 "IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include <openssl/sha.h>
#include <microhttpd.h>
-#include "afb-ws-json.h"
-
#include "afb-method.h"
#include "afb-context.h"
#include "afb-hreq.h"
#include "afb-websock.h"
+#include "afb-ws-json1.h"
+#include "afb-fdev.h"
+#include "fdev.h"
/**************** WebSocket connection upgrade ****************************/
struct protodef
{
const char *name;
- void *(*create)(int fd, void *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)
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)
+struct memo_websocket {
+ const struct protodef *proto;
+ struct afb_hreq *hreq;
+ struct afb_apiset *apiset;
+};
+
+static void close_websocket(void *closure)
{
- const union MHD_ConnectionInfo *info;
+ struct MHD_UpgradeResponseHandle *urh = closure;
+ MHD_upgrade_action (urh, MHD_UPGRADE_ACTION_CLOSE);
+}
+
+static void upgrade_to_websocket(
+ void *cls,
+ struct MHD_Connection *connection,
+ void *con_cls,
+ const char *extra_in,
+ size_t extra_in_size,
+ MHD_socket sock,
+ struct MHD_UpgradeResponseHandle *urh)
+{
+ struct memo_websocket *memo = cls;
+ void *ws;
+ struct fdev *fdev;
+
+ fdev = afb_fdev_create(sock);
+ if (!fdev) {
+ /* TODO */
+ close_websocket(urh);
+ } else {
+ fdev_set_autoclose(fdev, 0);
+ ws = memo->proto->create(fdev, memo->apiset, &memo->hreq->xreq.context, close_websocket, urh);
+ if (ws == NULL) {
+ /* TODO */
+ close_websocket(urh);
+ }
+ }
+#if MHD_VERSION <= 0x00095900
+ afb_hreq_unref(memo->hreq);
+#endif
+ free(memo);
+}
+
+static int check_websocket_upgrade(struct MHD_Connection *con, const struct protodef *protodefs, struct afb_hreq *hreq, struct afb_apiset *apiset)
+{
+ struct memo_websocket *memo;
struct MHD_Response *response;
const char *connection, *upgrade, *key, *version, *protocols;
char acceptval[29];
int vernum;
const struct protodef *proto;
- void *ws;
/* is an upgrade to websocket ? */
upgrade = MHD_lookup_connection_value(con, MHD_HEADER_KIND, MHD_HTTP_HEADER_UPGRADE);
/* is a connection for upgrade ? */
connection = MHD_lookup_connection_value(con, MHD_HEADER_KIND, MHD_HTTP_HEADER_CONNECTION);
if (connection == NULL
- || !headerhas (connection, MHD_HTTP_HEADER_UPGRADE))
+ || !headerhas (connection, MHD_HTTP_HEADER_UPGRADE))
return 0;
/* has a key and a version ? */
/* 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);
return 1;
}
- /* create the web socket */
- info = MHD_get_connection_info(con, MHD_CONNECTION_INFO_CONNECTION_FD);
- if (info == NULL) {
- response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
- MHD_queue_response(con, MHD_HTTP_INTERNAL_SERVER_ERROR, response);
- MHD_destroy_response(response);
- return 1;
- }
- ws = proto->create(info->connect_fd, context, (void*)MHD_resume_connection, con);
- if (ws == NULL) {
+ /* record context */
+ memo = malloc(sizeof *memo);
+ if (memo == NULL) {
response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
MHD_queue_response(con, MHD_HTTP_INTERNAL_SERVER_ERROR, response);
MHD_destroy_response(response);
return 1;
}
+ memo->proto = proto;
+ memo->hreq = hreq;
+ memo->apiset = apiset;
/* send the accept connection */
+ response = MHD_create_response_for_upgrade(upgrade_to_websocket, memo);
make_accept_value(key, acceptval);
- response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
MHD_add_response_header(response, sec_websocket_accept_s, acceptval);
MHD_add_response_header(response, sec_websocket_protocol_s, proto->name);
- MHD_add_response_header(response, MHD_HTTP_HEADER_CONNECTION, MHD_HTTP_HEADER_UPGRADE);
MHD_add_response_header(response, MHD_HTTP_HEADER_UPGRADE, websocket_s);
MHD_queue_response(con, MHD_HTTP_SWITCHING_PROTOCOLS, response);
MHD_destroy_response(response);
- *websock = ws;
return 1;
}
static const struct protodef protodefs[] = {
- { "x-afb-ws-json1", (void*)afb_ws_json_create },
+ { "x-afb-ws-json1", (void*)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;
/* is a get ? */
|| strcasecmp(hreq->version, MHD_HTTP_VERSION_1_1))
return 0;
- ws = NULL;
- rc = check_websocket_upgrade(hreq->connection, protodefs, hreq->context.session, &ws);
+ rc = check_websocket_upgrade(hreq->connection, protodefs, hreq, apiset);
if (rc == 1) {
hreq->replied = 1;
- if (ws != NULL)
- hreq->upgrade = 1;
}
return rc;
}
Code Review / src / app-framework-binder.git / blobdiff