Bindings V2: Remove explicit references to daemon/service

[src/app-framework-binder.git] / include / afb / afb-binding-v1.h

diff --git a/include/afb/afb-binding-v1.h b/include/afb/afb-binding-v1.h
index dc7af6f..e6f322f 100644 (file)
--- a/include/afb/afb-binding-v1.h
+++ b/include/afb/afb-binding-v1.h
@@ -18,7 +18,16 @@
 #pragma once
 
 struct json_object;
-struct afb_service;
+
+#include "afb-req-itf.h"
+#include "afb-event-itf.h"
+#include "afb-service-common.h"
+#include "afb-daemon-common.h"
+
+#include "afb-session-v1.h"
+#include "afb-daemon-v1.h"
+#include "afb-daemon-v1.h"
+
 struct afb_binding_v1;
 struct afb_binding_interface_v1;
 
@@ -41,7 +50,7 @@ struct afb_binding_interface_v1;
  * Be aware that the given 'interface' is not fully functionnal
  * because no provision is given to the name and description
  * of the binding. Check the function 'afbBindingV1ServiceInit'
- * defined in the file <afb/afb-service-itf.h> because when
+ * defined in the file <afb/afb-service-v1.h> because when
  * the function 'afbBindingV1ServiceInit' is called, the 'interface'
  * is fully functionnal.
  */
@@ -79,7 +88,7 @@ extern void afbBindingV1ServiceEvent(const char *event, struct json_object *obje
 struct afb_verb_desc_v1
 {
        const char *name;                       /* name of the verb */
-       enum afb_session_flags session;         /* authorisation and session requirements of the verb */
+       enum afb_session_flags_v1 session;      /* authorisation and session requirements of the verb */
        void (*callback)(struct afb_req req);   /* callback function implementing the verb */
        const char *info;                       /* textual description of the verb */
 };
@@ -153,3 +162,70 @@ struct afb_binding_interface_v1
 #endif
 
 
+/***************************************************************************************************/
+
+#if AFB_BINDING_VERSION == 1
+
+# define afb_binding           afb_binding_v1
+# define afb_binding_interface afb_binding_interface_v1
+
+# define AFB_SESSION_NONE      AFB_SESSION_NONE_V1
+# define AFB_SESSION_CREATE    AFB_SESSION_CREATE_V1
+# define AFB_SESSION_CLOSE     AFB_SESSION_CLOSE_V1
+# define AFB_SESSION_RENEW     AFB_SESSION_RENEW_V1
+# define AFB_SESSION_CHECK     AFB_SESSION_CHECK_V1
+
+# define AFB_SESSION_LOA_GE    AFB_SESSION_LOA_GE_V1
+# define AFB_SESSION_LOA_LE    AFB_SESSION_LOA_LE_V1
+# define AFB_SESSION_LOA_EQ    AFB_SESSION_LOA_EQ_V1
+
+# define AFB_SESSION_LOA_SHIFT AFB_SESSION_LOA_SHIFT_V1
+# define AFB_SESSION_LOA_MASK  AFB_SESSION_LOA_MASK_V1
+
+# define AFB_SESSION_LOA_0     AFB_SESSION_LOA_0_V1
+# define AFB_SESSION_LOA_1     AFB_SESSION_LOA_1_V1
+# define AFB_SESSION_LOA_2     AFB_SESSION_LOA_2_V1
+# define AFB_SESSION_LOA_3     AFB_SESSION_LOA_3_V1
+# define AFB_SESSION_LOA_4     AFB_SESSION_LOA_4_V1
+
+# define AFB_SESSION_LOA_LE_0  AFB_SESSION_LOA_LE_0_V1
+# define AFB_SESSION_LOA_LE_1  AFB_SESSION_LOA_LE_1_V1
+# define AFB_SESSION_LOA_LE_2  AFB_SESSION_LOA_LE_2_V1
+# define AFB_SESSION_LOA_LE_3  AFB_SESSION_LOA_LE_3_V1
+
+# define AFB_SESSION_LOA_EQ_0  AFB_SESSION_LOA_EQ_0_V1
+# define AFB_SESSION_LOA_EQ_1  AFB_SESSION_LOA_EQ_1_V1
+# define AFB_SESSION_LOA_EQ_2  AFB_SESSION_LOA_EQ_2_V1
+# define AFB_SESSION_LOA_EQ_3  AFB_SESSION_LOA_EQ_3_V1
+
+# define AFB_SESSION_LOA_GE_0  AFB_SESSION_LOA_GE_0_V1
+# define AFB_SESSION_LOA_GE_1  AFB_SESSION_LOA_GE_1_V1
+# define AFB_SESSION_LOA_GE_2  AFB_SESSION_LOA_GE_2_V1
+# define AFB_SESSION_LOA_GE_3  AFB_SESSION_LOA_GE_3_V1
+
+# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO)
+
+#  define ERROR                        AFB_ERROR_V1
+#  define WARNING              AFB_WARNING_V1
+#  define NOTICE               AFB_NOTICE_V1
+#  define INFO                 AFB_INFO_V1
+#  define DEBUG                        AFB_DEBUG_V1
+
+# endif
+
+#define afb_daemon_get_event_loop      afb_daemon_get_event_loop_v1
+#define afb_daemon_get_user_bus                afb_daemon_get_user_bus_v1
+#define afb_daemon_get_system_bus      afb_daemon_get_system_bus_v1
+#define afb_daemon_broadcast_event     afb_daemon_broadcast_event_v1
+#define afb_daemon_make_event          afb_daemon_make_event_v1
+#define afb_daemon_verbose             afb_daemon_verbose_v1
+#define afb_daemon_rootdir_get_fd      afb_daemon_rootdir_get_fd_v1
+#define afb_daemon_rootdir_open_locale afb_daemon_rootdir_open_locale_v1
+#define afb_daemon_queue_job           afb_daemon_queue_job_v1
+
+#define afb_service_call               afb_service_call_v1
+
+#endif
+
+
+