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
ensure that the copy is done by libmicrohttp
[src/app-framework-binder.git]
/
src
/
afb-ws-json.c
diff --git
a/src/afb-ws-json.c
b/src/afb-ws-json.c
index
e1347f1
..
4bdda7e
100644
(file)
--- a/
src/afb-ws-json.c
+++ b/
src/afb-ws-json.c
@@
-54,7
+54,7
@@
struct afb_ws_json
static void aws_send_event(struct afb_ws_json *ws, const char *event, struct json_object *object);
static void aws_send_event(struct afb_ws_json *ws, const char *event, struct json_object *object);
-static const struct afb_event_
sender_itf event_send
er_itf = {
+static const struct afb_event_
listener_itf event_listen
er_itf = {
.send = (void*)aws_send_event
};
.send = (void*)aws_send_event
};
@@
-84,13
+84,13
@@
struct afb_ws_json *afb_ws_json_create(int fd, struct AFB_clientCtx *context, vo
if (result->ws == NULL)
goto error4;
if (result->ws == NULL)
goto error4;
- if (0 > ctxClientEvent
SenderAdd(result->context, (struct afb_event_sender){ .itf = &event_send
er_itf, .closure = result }))
+ if (0 > ctxClientEvent
ListenerAdd(result->context, (struct afb_event_listener){ .itf = &event_listen
er_itf, .closure = result }))
goto error5;
return result;
error5:
goto error5;
return result;
error5:
- /* TODO */
+ afb_ws_destroy(result->ws);
error4:
json_tokener_free(result->tokener);
error3:
error4:
json_tokener_free(result->tokener);
error3:
@@
-104,7
+104,7
@@
error:
static void aws_on_hangup(struct afb_ws_json *ws)
{
static void aws_on_hangup(struct afb_ws_json *ws)
{
- ctxClientEvent
SenderRemove(ws->context, (struct afb_event_sender){ .itf = &event_send
er_itf, .closure = ws });
+ ctxClientEvent
ListenerRemove(ws->context, (struct afb_event_listener){ .itf = &event_listen
er_itf, .closure = ws });
afb_ws_destroy(ws->ws);
json_tokener_free(ws->tokener);
if (ws->cleanup != NULL)
afb_ws_destroy(ws->ws);
json_tokener_free(ws->tokener);
if (ws->cleanup != NULL)
@@
-160,7
+160,6
@@
static const struct afb_req_itf wsreq_itf = {
.session_close = (void*)wsreq_session_close,
.context_get = (void*)afb_context_get,
.context_set = (void*)afb_context_set
.session_close = (void*)wsreq_session_close,
.context_get = (void*)afb_context_get,
.context_set = (void*)afb_context_set
-
};
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)