/*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016 "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"
/**************** WebSocket connection upgrade ****************************/
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)
{
+ const union MHD_ConnectionInfo *info;
struct MHD_Response *response;
const char *connection, *upgrade, *key, *version, *protocols;
char acceptval[29];
/* 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);
}
/* create the web socket */
- ws = proto->create(dup(MHD_get_connection_info(con, MHD_CONNECTION_INFO_CONNECTION_FD)->connect_fd),
- context,
- (void*)MHD_resume_connection,
- con);
+ 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) {
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_json_create },
+ { "x-afb-ws-json1", (void*)afb_ws_json1_create },
{ NULL, NULL }
};
return 0;
ws = NULL;
- rc = check_websocket_upgrade(hreq->connection, protodefs, afb_hreq_context(hreq), &ws);
- if (rc && ws != NULL)
- hreq->upgrade = 1;
+ rc = check_websocket_upgrade(hreq->connection, protodefs, &hreq->context, &ws);
+ if (rc == 1) {
+ hreq->replied = 1;
+ if (ws != NULL)
+ hreq->upgrade = 1;
+ }
return rc;
}