Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rename afb-systemd to systemd
[src/app-framework-binder.git]
/
src
/
afb-ws-json1.c
diff --git
a/src/afb-ws-json1.c
b/src/afb-ws-json1.c
index
0fa13df
..
197d0c8
100644
(file)
--- a/
src/afb-ws-json1.c
+++ b/
src/afb-ws-json1.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2016
, 2017
"IoT.bzh"
+ * Copyright (C) 2016
-2019
"IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-27,7
+27,6
@@
#include "afb-wsj1.h"
#include "afb-ws-json1.h"
#include "afb-wsj1.h"
#include "afb-ws-json1.h"
-#include "afb-systemd.h"
#include "afb-msg-json.h"
#include "afb-session.h"
#include "afb-cred.h"
#include "afb-msg-json.h"
#include "afb-session.h"
#include "afb-cred.h"
@@
-35,7
+34,10
@@
#include "afb-xreq.h"
#include "afb-context.h"
#include "afb-evt.h"
#include "afb-xreq.h"
#include "afb-context.h"
#include "afb-evt.h"
+
+#include "systemd.h"
#include "verbose.h"
#include "verbose.h"
+#include "fdev.h"
/* predeclaration of structures */
struct afb_ws_json1;
/* predeclaration of structures */
struct afb_ws_json1;
@@
-48,7
+50,7
@@
static void aws_on_event(struct afb_ws_json1 *ws, const char *event, int eventid
/* predeclaration of wsreq callbacks */
static void wsreq_destroy(struct afb_xreq *xreq);
/* predeclaration of wsreq callbacks */
static void wsreq_destroy(struct afb_xreq *xreq);
-static void wsreq_reply(struct afb_xreq *xreq,
int status, json_object *obj
);
+static void wsreq_reply(struct afb_xreq *xreq,
struct json_object *object, const char *error, const char *info
);
/* declaration of websocket structure */
struct afb_ws_json1
/* declaration of websocket structure */
struct afb_ws_json1
@@
-99,11
+101,11
@@
static const struct afb_evt_itf evt_itf = {
****************************************************************
***************************************************************/
****************************************************************
***************************************************************/
-struct afb_ws_json1 *afb_ws_json1_create(
int fd
, struct afb_apiset *apiset, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure)
+struct afb_ws_json1 *afb_ws_json1_create(
struct fdev *fdev
, struct afb_apiset *apiset, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure)
{
struct afb_ws_json1 *result;
{
struct afb_ws_json1 *result;
- assert(fd
>= 0
);
+ assert(fd
ev
);
assert(context != NULL);
result = malloc(sizeof * result);
assert(context != NULL);
result = malloc(sizeof * result);
@@
-118,7
+120,7
@@
struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_apiset *apiset, stru
if (result->session == NULL)
goto error2;
if (result->session == NULL)
goto error2;
- result->wsj1 = afb_wsj1_create(
afb_systemd_get_event_loop(), fd
, &wsj1_itf, result);
+ result->wsj1 = afb_wsj1_create(
fdev
, &wsj1_itf, result);
if (result->wsj1 == NULL)
goto error3;
if (result->wsj1 == NULL)
goto error3;
@@
-126,7
+128,7
@@
struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_apiset *apiset, stru
if (result->listener == NULL)
goto error4;
if (result->listener == NULL)
goto error4;
- result->cred = afb_cred_create_for_socket(fd);
+ result->cred = afb_cred_create_for_socket(fd
ev_fd(fdev)
);
result->apiset = afb_apiset_addref(apiset);
return result;
result->apiset = afb_apiset_addref(apiset);
return result;
@@
-137,7
+139,7
@@
error3:
error2:
free(result);
error:
error2:
free(result);
error:
-
close(fd
);
+
fdev_unref(fdev
);
return NULL;
}
return NULL;
}
@@
-193,8
+195,8
@@
static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve
afb_wsj1_msg_addref(msg);
wsreq->msgj1 = msg;
wsreq->xreq.cred = afb_cred_addref(ws->cred);
afb_wsj1_msg_addref(msg);
wsreq->msgj1 = msg;
wsreq->xreq.cred = afb_cred_addref(ws->cred);
- wsreq->xreq.request.api = api;
- wsreq->xreq.request.verb = verb;
+ wsreq->xreq.request.
called_
api = api;
+ wsreq->xreq.request.
called_
verb = verb;
wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
wsreq->aws = afb_ws_json1_addref(ws);
wsreq->xreq.listener = wsreq->aws->listener;
wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
wsreq->aws = afb_ws_json1_addref(ws);
wsreq->xreq.listener = wsreq->aws->listener;
@@
-227,13
+229,17
@@
static void wsreq_destroy(struct afb_xreq *xreq)
free(wsreq);
}
free(wsreq);
}
-static void wsreq_reply(struct afb_xreq *xreq,
int status, json_object *obj
)
+static void wsreq_reply(struct afb_xreq *xreq,
struct json_object *object, const char *error, const char *info
)
{
struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq);
int rc;
{
struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq);
int rc;
+ struct json_object *reply;
+
+ /* create the reply */
+ reply = afb_msg_json_reply(object, error, info, &xreq->context);
- rc = (
status < 0
? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
- wsreq->msgj1,
obj
, afb_context_sent_token(&wsreq->xreq.context));
+ rc = (
error
? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
+ wsreq->msgj1,
reply
, afb_context_sent_token(&wsreq->xreq.context));
if (rc)
ERROR("Can't send reply: %m");
}
if (rc)
ERROR("Can't send reply: %m");
}