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
afb-socket: Improvement
[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
c796b17
..
95167b5
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, 2017
, 2018
"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");
@@
-25,11
+25,9
@@
#include <json-c/json.h>
#include <json-c/json.h>
-#include <afb/afb-event-itf.h>
-
#include "afb-wsj1.h"
#include "afb-ws-json1.h"
#include "afb-wsj1.h"
#include "afb-ws-json1.h"
-#include "afb-
common
.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"
@@
-38,6
+36,7
@@
#include "afb-context.h"
#include "afb-evt.h"
#include "verbose.h"
#include "afb-context.h"
#include "afb-evt.h"
#include "verbose.h"
+#include "fdev.h"
/* predeclaration of structures */
struct afb_ws_json1;
/* predeclaration of structures */
struct afb_ws_json1;
@@
-50,7
+49,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 iserror, 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
@@
-101,11
+100,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);
@@
-120,7
+119,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_common_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;
@@
-128,7
+127,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;
@@
-139,17
+138,17
@@
error3:
error2:
free(result);
error:
error2:
free(result);
error:
-
close(fd
);
+
fdev_unref(fdev
);
return NULL;
}
return NULL;
}
-st
atic struct afb_ws_json1 *aws
_addref(struct afb_ws_json1 *ws)
+st
ruct afb_ws_json1 *afb_ws_json1
_addref(struct afb_ws_json1 *ws)
{
__atomic_add_fetch(&ws->refcount, 1, __ATOMIC_RELAXED);
return ws;
}
{
__atomic_add_fetch(&ws->refcount, 1, __ATOMIC_RELAXED);
return ws;
}
-
static void aws
_unref(struct afb_ws_json1 *ws)
+
void afb_ws_json1
_unref(struct afb_ws_json1 *ws)
{
if (!__atomic_sub_fetch(&ws->refcount, 1, __ATOMIC_RELAXED)) {
afb_evt_listener_unref(ws->listener);
{
if (!__atomic_sub_fetch(&ws->refcount, 1, __ATOMIC_RELAXED)) {
afb_evt_listener_unref(ws->listener);
@@
-165,7
+164,7
@@
static void aws_unref(struct afb_ws_json1 *ws)
static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1)
{
static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1)
{
- a
ws
_unref(ws);
+ a
fb_ws_json1
_unref(ws);
}
static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg)
}
static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg)
@@
-195,10
+194,10
@@
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.api = api;
- wsreq->xreq.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->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
- wsreq->aws = a
ws
_addref(ws);
+ wsreq->aws = a
fb_ws_json1
_addref(ws);
wsreq->xreq.listener = wsreq->aws->listener;
/* emits the call */
wsreq->xreq.listener = wsreq->aws->listener;
/* emits the call */
@@
-225,17
+224,21
@@
static void wsreq_destroy(struct afb_xreq *xreq)
afb_context_disconnect(&wsreq->xreq.context);
afb_wsj1_msg_unref(wsreq->msgj1);
afb_cred_unref(wsreq->xreq.cred);
afb_context_disconnect(&wsreq->xreq.context);
afb_wsj1_msg_unref(wsreq->msgj1);
afb_cred_unref(wsreq->xreq.cred);
- a
ws
_unref(wsreq->aws);
+ a
fb_ws_json1
_unref(wsreq->aws);
free(wsreq);
}
free(wsreq);
}
-static void wsreq_reply(struct afb_xreq *xreq,
int iserror, 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 = (
is
error ? 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");
}