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

diff --git a/include/afb/afb-binding-v2.h b/include/afb/afb-binding-v2.h
index 1f47e219..66601b23 100644
--- a/include/afb/afb-binding-v2.h
+++ b/include/afb/afb-binding-v2.h
@@ -17,17 +17,17 @@
 
 #pragma once
 
-struct afb_binding_interface;
-struct afb_service;
-struct json_object;
+#include <stdint.h>
 
-/*
- * A binding V2 MUST have an exported symbol of name
- *
- *              afbBindingV2
- *
- */
-extern const struct afb_binding_v2 afbBindingV2;
+#include "afb-auth.h"
+#include "afb-req-itf.h"
+#include "afb-event-itf.h"
+#include "afb-service-common.h"
+#include "afb-daemon-common.h"
+
+#include "afb-session-v2.h"
+
+struct json_object;
 
 /*
  * Description of one verb of the API provided by the binding
@@ -37,8 +37,8 @@ struct afb_verb_v2
 {
 	const char *verb;                       /* name of the verb */
 	void (*callback)(struct afb_req req);   /* callback function implementing the verb */
-	const char * const *permissions;	/* required permissions */
-	enum afb_session_v1 session;            /* authorisation and session requirements of the verb */
+	const struct afb_auth *auth;		/* required authorisation */
+	uint32_t session;                       /* authorisation and session requirements of the verb */
 };
 
 /*
@@ -49,8 +49,82 @@ struct afb_binding_v2
 	const char *api;			/* api name for the binding */
 	const char *specification;		/* textual specification of the binding */
 	const struct afb_verb_v2 *verbs;	/* array of descriptions of verbs terminated by a NULL name */
-	int (*init)(const struct afb_binding_interface *interface);
-	int (*start)(const struct afb_binding_interface *interface, struct afb_service service);
+	int (*preinit)();
+	int (*init)();
 	void (*onevent)(const char *event, struct json_object *object);
+	unsigned noconcurrency: 1;		/* avoids concurrent requests to verbs */
+};
+
+struct afb_binding_data_v2
+{
+	int verbosity;			/* level of verbosity */
+	struct afb_daemon daemon;	/* access to daemon APIs */
+	struct afb_service service;	/* access to service APIs */
 };
 
+/*
+ * A binding V2 MUST have two exported symbols of name:
+ *
+ *            -  afbBindingV2
+ *            -  afbBindingV2data
+ *
+ */
+#if !defined(AFB_BINDING_MAIN_NAME_V2)
+extern const struct afb_binding_v2 afbBindingV2;
+#endif
+
+#if !defined(AFB_BINDING_DATA_NAME_V2)
+#define AFB_BINDING_DATA_NAME_V2 afbBindingV2data
+#endif
+
+#if AFB_BINDING_VERSION != 2
+extern
+#endif
+struct afb_binding_data_v2 AFB_BINDING_DATA_NAME_V2  __attribute__ ((weak));
+
+#define afb_get_verbosity_v2()	(AFB_BINDING_DATA_NAME_V2.verbosity)
+#define afb_get_daemon_v2()	(AFB_BINDING_DATA_NAME_V2.daemon)
+#define afb_get_service_v2()	(AFB_BINDING_DATA_NAME_V2.service)
+
+/*
+ * Macros for logging messages
+ */
+#if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO)
+# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS)
+#  define _AFB_LOGGING_V2_(vlevel,llevel,...) \
+	do{ \
+		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \
+			afb_daemon_verbose_v2(llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+	}while(0)
+#  define _AFB_REQ_LOGGING_V2_(vlevel,llevel,req,...) \
+	do{ \
+		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \
+			afb_req_verbose(req,llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+	}while(0)
+# else
+#  define _AFB_LOGGING_V2_(vlevel,llevel,...) \
+	do{ \
+		if(afbBindingV2data.verbosity>=vlevel) \
+			afb_daemon_verbose_v2(llevel,NULL,0,NULL,__VA_ARGS__); \
+	}while(0)
+#  define _AFB_REQ_LOGGING_V2_(vlevel,llevel,req,...) \
+	do{ \
+		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \
+			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__)
+#endif
+
+#include "afb-daemon-v2.h"
+#include "afb-service-v2.h"
+