X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb-plugin.h;h=63617cbe90952b0b4dcb259113a01412bd024203;hb=f1b901ed676b2d45ec8e6ae3d6ef2f94d79f9ee6;hp=c7252d640bd58cb4c172f5285c211b1d9a962172;hpb=469e619ac45402471ea7d8c792ffc06e79346ef2;p=src%2Fapp-framework-binder.git

diff --git a/include/afb-plugin.h b/include/afb-plugin.h
index c7252d64..63617cbe 100644
--- a/include/afb-plugin.h
+++ b/include/afb-plugin.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "afb-req-itf.h"
-#include "afb-pollmgr-itf.h"
 #include "afb-evmgr-itf.h"
 
 /* Plugin Type */
@@ -32,11 +31,12 @@ enum  AFB_pluginE
 /* Enum for Session/Token/Authentication middleware */
 enum AFB_sessionE
 {
-	AFB_SESSION_NONE,
-	AFB_SESSION_CREATE,
-	AFB_SESSION_CLOSE,
-	AFB_SESSION_RENEW,
-	AFB_SESSION_CHECK
+	AFB_SESSION_NONE = 0,
+	AFB_SESSION_CREATE = 1,
+	AFB_SESSION_CLOSE = 2,
+	AFB_SESSION_RENEW = 4,
+	AFB_SESSION_CHECK = 8,
+	AFB_SESSION_MASK = 15
 };
 
 /* API definition */
@@ -55,7 +55,6 @@ struct AFB_plugin
 	const char *info;
 	const char *prefix;
 	const struct AFB_restapi *apis;
-	void (*freeCtxCB)(void*);  // callback to free application context [null for standard free]
 };
 
 /* config mode */
@@ -65,9 +64,14 @@ enum AFB_Mode {
 	AFB_MODE_GLOBAL
 };
 
+struct sd_event;
+struct sd_bus;
+
 struct afb_daemon_itf {
 	struct afb_evmgr (*get_evmgr)(void *closure);
-	struct afb_pollmgr (*get_pollmgr)(void *closure);
+	struct sd_event *(*get_event_loop)(void *closure);
+	struct sd_bus *(*get_user_bus)(void *closure);
+	struct sd_bus *(*get_system_bus)(void *closure);
 };
 
 struct afb_daemon {
@@ -89,9 +93,19 @@ static inline struct afb_evmgr afb_daemon_get_evmgr(struct afb_daemon daemon)
 	return daemon.itf->get_evmgr(daemon.closure);
 }
 
-static inline struct afb_pollmgr afb_daemon_get_pollmgr(struct afb_daemon daemon)
+static inline struct sd_event *afb_daemon_get_event_loop(struct afb_daemon daemon)
+{
+	return daemon.itf->get_event_loop(daemon.closure);
+}
+
+static inline struct sd_bus *afb_daemon_get_user_bus(struct afb_daemon daemon)
+{
+	return daemon.itf->get_user_bus(daemon.closure);
+}
+
+static inline struct sd_bus *afb_daemon_get_system_bus(struct afb_daemon daemon)
 {
-	return daemon.itf->get_pollmgr(daemon.closure);
+	return daemon.itf->get_system_bus(daemon.closure);
 }