X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-wsj1.c;h=253bb5ea22930ee293eaa0edf72679492c356ee1;hb=dd1e45095d0525384a3600b8a4532046d35befac;hp=df4a23443acfbbc4a5bcf417558f73963466a911;hpb=8bfe628281a73708d35a6c6252c646c51b404484;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-wsj1.c b/src/afb-wsj1.c
index df4a2344..253bb5ea 100644
--- a/src/afb-wsj1.c
+++ b/src/afb-wsj1.c
@@ -79,7 +79,7 @@ struct afb_wsj1
 	struct wsj1_call *calls;
 };
 
-struct afb_wsj1 *afb_wsj1_create(int fd, struct afb_wsj1_itf *itf, void *closure)
+struct afb_wsj1 *afb_wsj1_create(struct sd_event *eloop, int fd, struct afb_wsj1_itf *itf, void *closure)
 {
 	struct afb_wsj1 *result;
 
@@ -97,7 +97,7 @@ struct afb_wsj1 *afb_wsj1_create(int fd, struct afb_wsj1_itf *itf, void *closure
 	if (result->tokener == NULL)
 		goto error2;
 
-	result->ws = afb_ws_create(fd, &wsj1_itf, result);
+	result->ws = afb_ws_create(eloop, fd, &wsj1_itf, result);
 	if (result->ws == NULL)
 		goto error3;
 
@@ -424,21 +424,29 @@ struct afb_wsj1 *afb_wsj1_msg_wsj1(struct afb_wsj1_msg *msg)
 	return msg->wsj1;
 }
 
+int afb_wsj1_close(struct afb_wsj1 *wsj1, uint16_t code, const char *text)
+{
+	return afb_ws_close(wsj1->ws, code, text);
+}
+
 static int wsj1_send_isot(struct afb_wsj1 *wsj1, int i1, const char *s1, const char *o1, const char *t1)
 {
 	char code[2] = { (char)('0' + i1), 0 };
-	return afb_ws_texts(wsj1->ws, "[", code, ",\"", s1, "\",", o1, t1 != NULL ? ",\"" : "]", t1, "\"]", NULL);
+	return afb_ws_texts(wsj1->ws, "[", code, ",\"", s1, "\",", o1 == NULL ? "null" : o1, t1 != NULL ? ",\"" : "]", t1, "\"]", NULL);
 }
 
 static int wsj1_send_issot(struct afb_wsj1 *wsj1, int i1, const char *s1, const char *s2, const char *o1, const char *t1)
 {
 	char code[2] = { (char)('0' + i1), 0 };
-	return afb_ws_texts(wsj1->ws, "[", code, ",\"", s1, "\",\"", s2, "\",", o1, t1 != NULL ? ",\"" : "]", t1, "\"]", NULL);
+	return afb_ws_texts(wsj1->ws, "[", code, ",\"", s1, "\",\"", s2, "\",", o1 == NULL ? "null" : o1, t1 != NULL ? ",\"" : "]", t1, "\"]", NULL);
 }
 
 int afb_wsj1_send_event_j(struct afb_wsj1 *wsj1, const char *event, struct json_object *object)
 {
-	return afb_wsj1_send_event_s(wsj1, event, json_object_to_json_string(object));
+	const char *objstr = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN);
+	int rc = afb_wsj1_send_event_s(wsj1, event, objstr);
+	json_object_put(object);
+	return rc;
 }
 
 int afb_wsj1_send_event_s(struct afb_wsj1 *wsj1, const char *event, const char *object)
@@ -448,7 +456,10 @@ int afb_wsj1_send_event_s(struct afb_wsj1 *wsj1, const char *event, const char *
 
 int afb_wsj1_call_j(struct afb_wsj1 *wsj1, const char *api, const char *verb, struct json_object *object, void (*on_reply)(void *closure, struct afb_wsj1_msg *msg), void *closure)
 {
-	return afb_wsj1_call_s(wsj1, api, verb, json_object_to_json_string(object), on_reply, closure);
+	const char *objstr = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN);
+	int rc = afb_wsj1_call_s(wsj1, api, verb, objstr, on_reply, closure);
+	json_object_put(object);
+	return rc;
 }
 
 int afb_wsj1_call_s(struct afb_wsj1 *wsj1, const char *api, const char *verb, const char *object, void (*on_reply)(void *closure, struct afb_wsj1_msg *msg), void *closure)
@@ -477,24 +488,16 @@ int afb_wsj1_call_s(struct afb_wsj1 *wsj1, const char *api, const char *verb, co
 	return rc;
 }
 
-
-int afb_wsj1_reply_ok_j(struct afb_wsj1_msg *msg, struct json_object *object, const char *token)
+int afb_wsj1_reply_j(struct afb_wsj1_msg *msg, struct json_object *object, const char *token, int iserror)
 {
-	return afb_wsj1_reply_ok_s(msg, json_object_to_json_string(object), token);
-}
-
-int afb_wsj1_reply_ok_s(struct afb_wsj1_msg *msg, const char *object, const char *token)
-{
-	return wsj1_send_isot(msg->wsj1, RETOK, msg->id, object, token);
-}
-
-int afb_wsj1_reply_error_j(struct afb_wsj1_msg *msg, struct json_object *object, const char *token)
-{
-	return afb_wsj1_reply_error_s(msg, json_object_to_json_string(object), token);
+	const char *objstr = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN);
+	int rc = afb_wsj1_reply_s(msg, objstr, token, iserror);
+	json_object_put(object);
+	return rc;
 }
 
-int afb_wsj1_reply_error_s(struct afb_wsj1_msg *msg, const char *object, const char *token)
+int afb_wsj1_reply_s(struct afb_wsj1_msg *msg, const char *object, const char *token, int iserror)
 {
-	return wsj1_send_isot(msg->wsj1, RETERR, msg->id, object, token);
+	return wsj1_send_isot(msg->wsj1, iserror ? RETERR : RETOK, msg->id, object, token);
 }