X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fafb-req-common.h;h=1bb017efcd7ff13fcabaddd149f905a0142ccca3;hb=5659246230cef16abae4b1edda9791a1f25fc03d;hp=8ff1b39b2b11fabff9ede40ac828a01832d3e6e8;hpb=c6380108964e71f533d8c672bb9c217020a95e8d;p=src%2Fapp-framework-binder.git

diff --git a/include/afb/afb-req-common.h b/include/afb/afb-req-common.h
index 8ff1b39b..1bb017ef 100644
--- a/include/afb/afb-req-common.h
+++ b/include/afb/afb-req-common.h
@@ -23,6 +23,7 @@
 
 struct json_object;
 struct afb_stored_req;
+struct afb_req;
 
 /*
  * Describes an argument (or parameter) of a request
@@ -72,6 +73,10 @@ struct afb_req_itf
 
 	void (*vverbose)(void *closure, int level, const char *file, int line, const char * func, const char *fmt, va_list args);
 	struct afb_stored_req *(*store)(void *closure);
+	void (*subcall_req)(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure);
+
+	int (*has_permission)(void *closure, const char *permission);
+	char *(*get_application_id)(void *closure);
 };
 
 /*
@@ -84,13 +89,13 @@ struct afb_req
 };
 
 /*
- * Checks wether the request 'req' is valid or not.
+ * Checks whether the request 'req' is valid or not.
  *
  * Returns 0 if not valid or 1 if valid.
  */
 static inline int afb_req_is_valid(struct afb_req req)
 {
-	return req.itf != NULL;
+	return !!req.itf;
 }
 
 /*
@@ -253,7 +258,7 @@ static inline void afb_req_context_set(struct afb_req req, void *context, void (
 static inline void *afb_req_context(struct afb_req req, void *(*create_context)(), void (*free_context)(void*))
 {
 	void *result = afb_req_context_get(req);
-	if (result == NULL) {
+	if (!result) {
 		result = create_context();
 		afb_req_context_set(req, result, free_context);
 	}
@@ -268,7 +273,7 @@ static inline void *afb_req_context(struct afb_req req, void *(*create_context)(
  */
 static inline void afb_req_context_clear(struct afb_req req)
 {
-	afb_req_context_set(req, NULL, NULL);
+	afb_req_context_set(req, 0, 0);
 }
 
 /*
@@ -336,30 +341,61 @@ static inline int afb_req_unsubscribe(struct afb_req req, struct afb_event event
  * This call is made in the context of the request 'req'.
  * On completion, the function 'callback' is invoked with the
  * 'closure' given at call and two other parameters: 'iserror' and 'result'.
- * 'iserror' is a boolean that indicates if the reply is an error reply.
+ * 'status' is 0 on success or negative when on an error reply.
  * 'result' is the json object of the reply, you must not call json_object_put
  * on the result.
  *
  * For convenience, the function calls 'json_object_put' for 'args'.
  * Thus, in the case where 'args' should remain available after
  * the function returns, the function 'json_object_get' shall be used.
+ *
+ * See also:
+ *  - 'afb_req_subcall_req' that is convenient to keep request alive automatically.
+ *  - 'afb_req_subcall_sync' the synchronous version
  */
 static inline void afb_req_subcall(struct afb_req req, const char *api, const char *verb, struct json_object *args, void (*callback)(void *closure, int iserror, struct json_object *result), void *closure)
 {
 	req.itf->subcall(req.closure, api, verb, args, callback, closure);
 }
 
+/*
+ * Makes a call to the method of name 'api' / 'verb' with the object 'args'.
+ * This call is made in the context of the request 'req'.
+ * On completion, the function 'callback' is invoked with the
+ * original request 'req', the 'closure' given at call and two
+ * other parameters: 'iserror' and 'result'.
+ * 'status' is 0 on success or negative when on an error reply.
+ * 'result' is the json object of the reply, you must not call json_object_put
+ * on the result.
+ *
+ * For convenience, the function calls 'json_object_put' for 'args'.
+ * Thus, in the case where 'args' should remain available after
+ * the function returns, the function 'json_object_get' shall be used.
+ *
+ * See also:
+ *  - 'afb_req_subcall' that doesn't keep request alive automatically.
+ *  - 'afb_req_subcall_sync' the synchronous version
+ */
+static inline void afb_req_subcall_req(struct afb_req req, const char *api, const char *verb, struct json_object *args, void (*callback)(void *closure, int iserror, struct json_object *result, struct afb_req req), void *closure)
+{
+	req.itf->subcall_req(req.closure, api, verb, args, callback, closure);
+}
+
 /*
  * Makes a call to the method of name 'api' / 'verb' with the object 'args'.
  * This call is made in the context of the request 'req'.
  * This call is synchronous, it waits untill completion of the request.
- * It returns 0 on an error answer and returns 1 when no error was detected.
+ * It returns 0 on success or a negative value on error answer.
  * The object pointed by 'result' is filled and must be released by the caller
  * after its use by calling 'json_object_put'.
  *
  * For convenience, the function calls 'json_object_put' for 'args'.
  * Thus, in the case where 'args' should remain available after
  * the function returns, the function 'json_object_get' shall be used.
+ *
+ * See also:
+ *  - 'afb_req_subcall_req' that is convenient to keep request alive automatically.
+ *  - 'afb_req_subcall' that doesn't keep request alive automatically.
  */
 static inline int afb_req_subcall_sync(struct afb_req req, const char *api, const char *verb, struct json_object *args, struct json_object **result)
 {
@@ -398,3 +434,29 @@ static inline void afb_req_verbose(struct afb_req req, int level, const char *fi
 #else
 #define AFB_REQ_VERBOSE(req,level,...) afb_req_verbose(req,level,NULL,0,NULL,__VA_ARGS__)
 #endif
+
+/*
+ * Check whether the 'permission' is granted or not to the client
+ * identified by 'req'.
+ *
+ * Returns 1 if the permission is granted or 0 otherwise.
+ */
+static inline int afb_req_has_permission(struct afb_req req, const char *permission)
+{
+	return req.itf->has_permission(req.closure, permission);
+}
+
+/*
+ * Get the application identifier of the client application for the
+ * request 'req'.
+ *
+ * Returns the application identifier or NULL when the application
+ * can not be identified.
+ *
+ * The returned value if not NULL must be freed by the caller
+ */
+static inline char *afb_req_get_application_id(struct afb_req req)
+{
+	return req.itf->get_application_id(req.closure);
+}
+