3 files changed, 100 insertions, 11 deletions

diff --git a/include/afb-poll-itf.h b/include/afb-evmgr-itf.h
index b70eb993..2268ec90 100644
--- a/include/afb-poll-itf.h
+++ b/include/afb-evmgr-itf.h
@@ -17,13 +17,19 @@
 
 #pragma once
 
-struct afb_pollitf
-{
-	int (*wait)(int timeout, void *pollclosure);
-	void *(*open)(int fd, void *closure, void *pollclosure);
-	int (*on_readable)(void *hndl, void (*cb)(void *closure));
-	int (*on_writable)(void *hndl, void (*cb)(void *closure));
-	void (*on_hangup)(void *hndl, void (*cb)(void *closure));
-	void (*close)(void *hndl);
+struct json_object;
+
+struct afb_evmgr_itf {
+	void (*push)(void *evmgr, const char *name, struct json_object *object);
+};
+
+struct afb_evmgr {
+	const struct afb_evmgr_itf *itf;
+	void *closure;
 };
 
+static inline void afb_evmgr_push(struct afb_evmgr mgr, const char *name, struct json_object *object)
+{
+	return mgr.itf->push(mgr.closure, name, object);
+}
+
diff --git a/include/afb-plugin.h b/include/afb-plugin.h
index 2c9935e6..c7252d64 100644
--- a/include/afb-plugin.h
+++ b/include/afb-plugin.h
@@ -17,7 +17,9 @@
 
 #pragma once
 
-struct afb_req;
+#include "afb-req-itf.h"
+#include "afb-pollmgr-itf.h"
+#include "afb-evmgr-itf.h"
 
 /* Plugin Type */
 enum  AFB_pluginE
@@ -63,13 +65,33 @@ enum AFB_Mode {
 	AFB_MODE_GLOBAL
 };
 
+struct afb_daemon_itf {
+	struct afb_evmgr (*get_evmgr)(void *closure);
+	struct afb_pollmgr (*get_pollmgr)(void *closure);
+};
+
+struct afb_daemon {
+	const struct afb_daemon_itf *itf;
+	void *closure;
+};
+
 struct AFB_interface
 {
 	int verbosity;
 	enum AFB_Mode mode;
-	const struct afb_pollitf *pollitf;
-	void *pollclosure;
+	struct afb_daemon daemon;
 };
 
 extern const struct AFB_plugin *pluginRegister (const struct AFB_interface *interface);
 
+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)
+{
+	return daemon.itf->get_pollmgr(daemon.closure);
+}
+
+
diff --git a/include/afb-pollmgr-itf.h b/include/afb-pollmgr-itf.h
new file mode 100644
index 00000000..c3a62c17
--- /dev/null
+++ b/include/afb-pollmgr-itf.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2016 IoT.bzh
+ * Author: José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+struct afb_pollmgr_itf
+{
+	int (*wait)(int timeout, void *pollclosure);
+	void *(*open)(int fd, void *closure, void *pollclosure);
+	int (*on_readable)(void *hndl, void (*cb)(void *closure));
+	int (*on_writable)(void *hndl, void (*cb)(void *closure));
+	void (*on_hangup)(void *hndl, void (*cb)(void *closure));
+	void (*close)(void *hndl);
+};
+
+struct afb_pollmgr
+{
+	const struct afb_pollmgr_itf *itf;
+	void *closure;
+};
+
+static inline int afb_pollmgr_wait(struct afb_pollmgr pollmgr, int timeout)
+{
+	return pollmgr.itf->wait(timeout, pollmgr.closure);
+}
+
+static inline void *afb_pollmgr_open(struct afb_pollmgr pollmgr, int fd, void *closure)
+{
+	return pollmgr.itf->open(fd, closure, pollmgr.closure);
+}
+
+static inline int afb_pollmgr_on_readable(struct afb_pollmgr pollmgr, void *hndl, void (*cb)(void *closure))
+{
+	return pollmgr.itf->on_readable(hndl, cb);
+}
+
+static inline int afb_pollmgr_on_writable(struct afb_pollmgr pollmgr, void *hndl, void (*cb)(void *closure))
+{
+	return pollmgr.itf->on_writable(hndl, cb);
+}
+
+static inline void afb_pollmgr_on_hangup(struct afb_pollmgr pollmgr, void *hndl, void (*cb)(void *closure))
+{
+	pollmgr.itf->on_hangup(hndl, cb);
+}
+
+