/*
- * 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 "afb-ws-json1.h"
#include "afb-msg-json.h"
#include "session.h"
-#include "afb-req-itf.h"
+#include <afb/afb-req-itf.h>
#include "afb-apis.h"
#include "afb-context.h"
struct AFB_clientCtx *session;
struct json_tokener *tokener;
struct afb_ws *ws;
+ int new_session;
};
static void aws_send_event(struct afb_ws_json1 *ws, const char *event, struct json_object *object);
return (struct afb_event_listener){ .itf = &event_listener_itf, .closure = aws };
}
-struct afb_ws_json1 *afb_ws_json1_create(int fd, struct AFB_clientCtx *session, void (*cleanup)(void*), void *cleanup_closure)
+struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure)
{
struct afb_ws_json1 *result;
assert(fd >= 0);
- assert(session != NULL);
+ assert(context != NULL);
result = malloc(sizeof * result);
if (result == NULL)
result->cleanup = cleanup;
result->cleanup_closure = cleanup_closure;
result->requests = NULL;
- result->session = ctxClientAddRef(session);
+ result->session = ctxClientAddRef(context->session);
+ result->new_session = context->created != 0;
if (result->session == NULL)
goto error2;
afb_context_init(&wsreq->context, ws->session, wsreq->tok);
if (!wsreq->context.invalidated)
wsreq->context.validated = 1;
+ if (ws->new_session != 0) {
+ wsreq->context.created = 1;
+ ws->new_session = 0;
+ }
wsreq->refcount = 1;
wsreq->aws = ws;
wsreq->next = ws->requests;
static void wsreq_reply(struct afb_wsreq *wsreq, int retcode, const char *status, const char *info, json_object *resp)
{
+ const char *uuid = afb_context_sent_uuid(&wsreq->context);
const char *token = afb_context_sent_token(&wsreq->context);
- aws_emit(wsreq->aws, retcode, wsreq->id, wsreq->idlen, afb_msg_json_reply(status, info, resp, token, NULL), token);
+ struct json_object *reply = afb_msg_json_reply(status, info, resp, token, uuid);
+ aws_emit(wsreq->aws, retcode, wsreq->id, wsreq->idlen, reply, token);
}
static void wsreq_fail(struct afb_wsreq *wsreq, const char *status, const char *info)