-extern int jbus_replyj(struct jreq *jreq, const char *reply);
-extern int jbus_reply(struct jreq *jreq, struct json_object *reply);
-extern int jbus_add_service(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, struct json_object *));
-extern int jbus_start_serving(struct jbus *jbus);
-extern int jbus_read_write_dispatch(struct jbus *jbus, int toms);
+/* verbs for the clients */
+extern int jbus_call_ss(
+ struct jbus *jbus,
+ const char *method,
+ const char *query,
+ void (*onresp) (int, const char *, void *),
+ void *data);
+
+extern int jbus_call_js(
+ struct jbus *jbus,
+ const char *method,
+ struct json_object *query,
+ void (*onresp) (int, const char *, void *),
+ void *data);
+
+extern int jbus_call_sj(
+ struct jbus *jbus,
+ const char *method,
+ const char *query,
+ void (*onresp) (int, struct json_object *, void *),
+ void *data);
+
+extern int jbus_call_jj(
+ struct jbus *jbus,
+ const char *method,
+ struct json_object *query,
+ void (*onresp) (int, struct json_object *, void *),
+ void *data);
+
+extern char *jbus_call_ss_sync(
+ struct jbus *jbus,
+ const char *method,
+ const char *query);
+
+extern char *jbus_call_js_sync(
+ struct jbus *jbus,
+ const char *method,
+ struct json_object *query);
+
+extern struct json_object *jbus_call_sj_sync(
+ struct jbus *jbus,
+ const char *method,
+ const char *query);
+
+extern struct json_object *jbus_call_jj_sync(
+ struct jbus *jbus,
+ const char *method,
+ struct json_object *query);
+
+extern int jbus_on_signal_s(
+ struct jbus *jbus,
+ const char *name,
+ void (*onsignal) (const char *, void *),
+ void *data);
+
+extern int jbus_on_signal_j(
+ struct jbus *jbus,
+ const char *name,
+ void (*onsignal) (struct json_object *, void *),
+ void *data);
+
+/* verbs for servers */
+extern int jbus_reply_s(
+ struct sd_bus_message *smsg,
+ const char *reply);
+
+extern int jbus_reply_j(
+ struct sd_bus_message *smsg,
+ struct json_object *reply);
+
+extern int jbus_reply_error_s(
+ struct sd_bus_message *smsg,
+ const char *reply);
+
+extern int jbus_reply_error_j(
+ struct sd_bus_message *smsg,
+ struct json_object *reply);
+
+extern int jbus_add_service_s(
+ struct jbus *jbus,
+ const char *method,
+ void (*oncall) (struct sd_bus_message *, const char *, void *),
+ void *data);
+
+extern int jbus_add_service_j(
+ struct jbus *jbus,
+ const char *method,
+ void (*oncall) (struct sd_bus_message *, struct json_object *, void *),
+ void *data);
+
+extern int jbus_start_serving(
+ struct jbus *jbus);
+
+extern int jbus_send_signal_s(
+ struct jbus *jbus,
+ const char *name,
+ const char *content);