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
DBus binding: first draft
[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
78b8c21
..
88f9b35
100644
(file)
--- a/
src/afb-ws-json1.c
+++ b/
src/afb-ws-json1.c
@@
-129,6
+129,10
@@
static void aws_on_hangup(struct afb_ws_json1 *ws)
struct afb_wsreq
{
struct afb_wsreq
{
+ /*
+ * CAUTION: 'context' field should be the first because there
+ * is an implicit convertion to struct afb_context
+ */
struct afb_context context;
int refcount;
struct afb_ws_json1 *aws;
struct afb_context context;
int refcount;
struct afb_ws_json1 *aws;
@@
-169,7
+173,9
@@
static const struct afb_req_itf wsreq_itf = {
.context_get = (void*)afb_context_get,
.context_set = (void*)afb_context_set,
.addref = (void*)wsreq_addref,
.context_get = (void*)afb_context_get,
.context_set = (void*)afb_context_set,
.addref = (void*)wsreq_addref,
- .unref = (void*)wsreq_unref
+ .unref = (void*)wsreq_unref,
+ .session_close = (void*)afb_context_close,
+ .session_set_LOA = (void*)afb_context_change_loa
};
static int aws_wsreq_parse(struct afb_wsreq *r, char *text, size_t size)
};
static int aws_wsreq_parse(struct afb_wsreq *r, char *text, size_t size)
@@
-410,7
+416,7
@@
static void aws_emit(struct afb_ws_json1 *aws, int code, const char *id, size_t
json_object_array_add(msg, json_object_new_string(token));
/* emits the reply */
json_object_array_add(msg, json_object_new_string(token));
/* emits the reply */
- txt = json_object_to_json_string
(msg
);
+ txt = json_object_to_json_string
_ext(msg, JSON_C_TO_STRING_PLAIN
);
afb_ws_text(aws->ws, txt, strlen(txt));
json_object_put(msg);
}
afb_ws_text(aws->ws, txt, strlen(txt));
json_object_put(msg);
}