X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fafb-binding-v2.h;h=8831a434bf4983a76b36c40f5f5c04fe85a065d5;hb=6d8d9dc5aad148a74bcdf8965bee9f7058a08166;hp=66601b23b291144ac35f5399d9c09b43a289272b;hpb=524ce4c40da3b25630dffdd80c5aca99364a3569;p=src%2Fapp-framework-binder.git

diff --git a/include/afb/afb-binding-v2.h b/include/afb/afb-binding-v2.h
index 66601b23..8831a434 100644
--- a/include/afb/afb-binding-v2.h
+++ b/include/afb/afb-binding-v2.h
@@ -20,11 +20,12 @@
 #include <stdint.h>
 
 #include "afb-auth.h"
-#include "afb-req-itf.h"
 #include "afb-event-itf.h"
+#include "afb-req-common.h"
 #include "afb-service-common.h"
 #include "afb-daemon-common.h"
 
+#include "afb-req-v2.h"
 #include "afb-session-v2.h"
 
 struct json_object;
@@ -35,9 +36,10 @@ struct json_object;
  */
 struct afb_verb_v2
 {
-	const char *verb;                       /* name of the verb */
+	const char *verb;                       /* name of the verb, NULL only at end of the array */
 	void (*callback)(struct afb_req req);   /* callback function implementing the verb */
-	const struct afb_auth *auth;		/* required authorisation */
+	const struct afb_auth *auth;		/* required authorisation, can be NULL */
+	const char *info;			/* some info about the verb, can be NULL */
 	uint32_t session;                       /* authorisation and session requirements of the verb */
 };
 
@@ -47,11 +49,12 @@ struct afb_verb_v2
 struct afb_binding_v2
 {
 	const char *api;			/* api name for the binding */
-	const char *specification;		/* textual specification of the binding */
+	const char *specification;		/* textual specification of the binding, can be NULL */
+	const char *info;			/* some info about the api, can be NULL */
 	const struct afb_verb_v2 *verbs;	/* array of descriptions of verbs terminated by a NULL name */
-	int (*preinit)();
-	int (*init)();
-	void (*onevent)(const char *event, struct json_object *object);
+	int (*preinit)();                       /* callback at load of the binding */
+	int (*init)();                          /* callback for starting the service */
+	void (*onevent)(const char *event, struct json_object *object); /* callback for handling events */
 	unsigned noconcurrency: 1;		/* avoids concurrent requests to verbs */
 };
 
@@ -113,16 +116,17 @@ struct afb_binding_data_v2 AFB_BINDING_DATA_NAME_V2  __attribute__ ((weak));
 			afb_req_verbose(req,llevel,NULL,0,NULL,__VA_ARGS__); \
 	}while(0)
 # endif
-# define AFB_ERROR_V2(...)       _AFB_LOGGING_V2_(0,3,__VA_ARGS__)
-# define AFB_WARNING_V2(...)     _AFB_LOGGING_V2_(1,4,__VA_ARGS__)
-# define AFB_NOTICE_V2(...)      _AFB_LOGGING_V2_(1,5,__VA_ARGS__)
-# define AFB_INFO_V2(...)        _AFB_LOGGING_V2_(2,6,__VA_ARGS__)
-# define AFB_DEBUG_V2(...)       _AFB_LOGGING_V2_(3,7,__VA_ARGS__)
-# define AFB_REQ_ERROR_V2(...)   _AFB_REQ_LOGGING_V2_(0,3,__VA_ARGS__)
-# define AFB_REQ_WARNING_V2(...) _AFB_REQ_LOGGING_V2_(1,4,__VA_ARGS__)
-# define AFB_REQ_NOTICE_V2(...)  _AFB_REQ_LOGGING_V2_(1,5,__VA_ARGS__)
-# define AFB_REQ_INFO_V2(...)    _AFB_REQ_LOGGING_V2_(2,6,__VA_ARGS__)
-# define AFB_REQ_DEBUG_V2(...)   _AFB_REQ_LOGGING_V2_(3,7,__VA_ARGS__)
+# include "afb-verbosity.h"
+# define AFB_ERROR_V2(...)       _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_ERROR,_AFB_SYSLOG_LEVEL_ERROR_,__VA_ARGS__)
+# define AFB_WARNING_V2(...)     _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_WARNING,_AFB_SYSLOG_LEVEL_WARNING_,__VA_ARGS__)
+# define AFB_NOTICE_V2(...)      _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_NOTICE,_AFB_SYSLOG_LEVEL_NOTICE_,__VA_ARGS__)
+# define AFB_INFO_V2(...)        _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_INFO,_AFB_SYSLOG_LEVEL_INFO_,__VA_ARGS__)
+# define AFB_DEBUG_V2(...)       _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_DEBUG,_AFB_SYSLOG_LEVEL_DEBUG_,__VA_ARGS__)
+# define AFB_REQ_ERROR_V2(...)   _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_ERROR,_AFB_SYSLOG_LEVEL_ERROR_,__VA_ARGS__)
+# define AFB_REQ_WARNING_V2(...) _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_WARNING,_AFB_SYSLOG_LEVEL_WARNING_,__VA_ARGS__)
+# define AFB_REQ_NOTICE_V2(...)  _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_NOTICE,_AFB_SYSLOG_LEVEL_NOTICE_,__VA_ARGS__)
+# define AFB_REQ_INFO_V2(...)    _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_INFO,_AFB_SYSLOG_LEVEL_INFO_,__VA_ARGS__)
+# define AFB_REQ_DEBUG_V2(...)   _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_DEBUG,_AFB_SYSLOG_LEVEL_DEBUG_,__VA_ARGS__)
 #endif
 
 #include "afb-daemon-v2.h"