Migration to v3

This makes controller fully compatible with binding v3 and
also keeps the compatibility with the Pre-V3 + DYNAPI bindings.

Change-Id: Iaa47e51b9cb964bbe2f050784fca355c780673f8
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

1 files changed, 97 insertions, 8 deletions

diff --git a/ctl-lib/afb-definitions.h b/ctl-lib/afb-definitions.h
index 4b0f35c..1f4495f 100644
--- a/ctl-lib/afb-definitions.h
+++ b/ctl-lib/afb-definitions.h
@@ -20,8 +20,8 @@
 #ifndef _AFB_DEFINITIONS_INCLUDE_
 #define _AFB_DEFINITIONS_INCLUDE_
 
-// Waiting for a clean AppFW-V3 API
-#if((AFB_BINDING_VERSION == 0 || AFB_BINDING_VERSION == 3) && defined(AFB_BINDING_WANT_DYNAPI))
+// Legacy DYNAPI support. Deprecated and will be removed.
+#if((AFB_BINDING_VERSION == 0) && defined(AFB_BINDING_WANT_DYNAPI))
     #include <afb/afb-binding.h>
 
     #define AFB_BINDING_PREV3
@@ -55,11 +55,7 @@
     #define AFB_ApiError(api, ...)    AFB_DYNAPI_ERROR (api, __VA_ARGS__)
     #define AFB_ApiInfo(api, ...)     AFB_DYNAPI_INFO (api, __VA_ARGS__)
 
-#if(AFB_BINDING_VERSION == 3)
-    #define AFB_GetApiSettings  afb_api_settings
-#else
     #define AFB_GetApiSettings(api) json_object_new_object()
-#endif
 
     #define AFB_ReqIsValid(request)   request
     #define AFB_EvtIsValid(evtHandle) evtHandle
@@ -72,12 +68,104 @@
 
     #define AFB_GetEventLoop(api) afb_dynapi_get_event_loop(api)
     #define AFB_RootDirGetFD(api) afb_dynapi_rootdir_get_fd(api)
+    #define AFB_ReqVCBData afb_request_get_vcbdata
+    #define AFB_ReqGetApi afb_request_get_dynapi
 
     #define AFB_ClientCtxSet(request, replace, createCB, freeCB, handle) afb_request_context(request, replace, createCB, freeCB, handle)
     #define AFB_ClientCtxClear(request) afb_request_context_clear(request)
 
     #define AFB_ReqSetLOA(request, level) afb_request_session_set_LOA(request, level)
 
+    #define AFB_NewApi afb_dynapi_new_api
+
+    #define  AFB_ApiAddVerb(a,b,c,d,e,f,g,h) afb_dynapi_add_verb(a,b,c,d,e,f,g)
+
+    #define AFB_ApiSetUserData afb_dynapi_set_userdata
+    #define AFB_ApiGetUserData afb_dynapi_get_userdata
+
+    #define AFB_ApiOnEvent afb_dynapi_on_event
+    #define AFB_ApiOnInit afb_dynapi_on_init
+    #define AFB_ApiSeal afb_dynapi_seal
+
+    typedef struct {
+            const char *verb;                       /* name of the verb, NULL only at end of the array */
+            void (*callback)(AFB_ReqT req);   /* callback function implementing the verb */
+            const struct afb_auth *auth;		/* required authorisation, can be NULL */
+            const char *info;			/* some info about the verb, can be NULL */
+            uint32_t session;
+    } AFB_ApiVerbs;
+#elif(AFB_BINDING_VERSION == 3)
+    #include <afb/afb-binding.h>
+
+    #define AFB_ReqNone NULL
+    typedef afb_req_t AFB_ReqT;
+    typedef afb_api_t  AFB_ApiT;
+
+    typedef afb_event_t AFB_EventT;
+    #define AFB_EventIsValid(eventid) eventid
+    #define AFB_EventPush afb_event_push
+    #define AFB_ReqSubscribe  afb_req_subscribe
+    #define AFB_EventMake(api, name) afb_api_make_event(api, name)
+
+    #define AFB_ReqJson(request) afb_req_json(request)
+
+    #define AFB_ReqSuccess  afb_req_success
+    #define AFB_ReqSuccessF afb_req_success_f
+    #define AFB_ReqFail    afb_req_fail
+    #define AFB_ReqFailF   afb_req_fail_f
+
+    #define AFB_ReqNotice(request, ...)   AFB_REQ_NOTICE (request, __VA_ARGS__)
+    #define AFB_ReqWarning(request, ...)  AFB_REQ_WARNING (request, __VA_ARGS__)
+    #define AFB_ReqDebug(request, ...)    AFB_REQ_DEBUG (request, __VA_ARGS__)
+    #define AFB_ReqError(request, ...)    AFB_REQ_ERROR (request, __VA_ARGS__)
+    #define AFB_ReqInfo(request, ...)     AFB_REQ_INFO (request, __VA_ARGS__)
+
+    #define AFB_ApiVerbose(api, level, ...) afb_api_verbose(api, level, __VA_ARGS__)
+    #define AFB_ApiNotice(api, ...)   AFB_API_NOTICE (api, __VA_ARGS__)
+    #define AFB_ApiWarning(api, ...)  AFB_API_WARNING (api, __VA_ARGS__)
+    #define AFB_ApiDebug(api, ...)    AFB_API_DEBUG (api, __VA_ARGS__)
+    #define AFB_ApiError(api, ...)    AFB_API_ERROR (api, __VA_ARGS__)
+    #define AFB_ApiInfo(api, ...)     AFB_API_INFO (api, __VA_ARGS__)
+
+    #define AFB_GetApiSettings afb_api_settings
+
+    #define AFB_ReqIsValid(request)   request
+    #define AFB_EvtIsValid(evtHandle) evtHandle
+
+#if ! defined(afb_service_call_legacy) || ! defined(afb_service_call_sync_legacy)
+    #define afb_service_call_legacy afb_api_x3_call_legacy
+    #define afb_service_call_sync_legacy afb_api_x3_call_sync_legacy
+#endif
+
+    #define AFB_ServiceCall(api, ...) afb_service_call_legacy(api,__VA_ARGS__)
+    #define AFB_ServiceSync(api, ...) afb_service_call_sync_legacy(api, __VA_ARGS__)
+
+    #define AFB_ApiCall(api, ...) afb_api_call(api, __VA_ARGS__)
+    #define AFB_ApiSync(api, ...) afb_api_call_sync(api, __VA_ARGS__)
+
+    #define AFB_RequireApi(api, ...) afb_api_require_api(api, __VA_ARGS__)
+
+    #define AFB_GetEventLoop(api) afb_api_get_event_loop(api)
+    #define AFB_RootDirGetFD(api) afb_api_rootdir_get_fd(api)
+    #define AFB_ReqVCBData afb_req_get_vcbdata
+    #define AFB_ReqGetApi afb_req_get_api
+
+    #define AFB_ClientCtxSet(request, replace, createCB, freeCB, handle) afb_req_context(request, replace, createCB, freeCB, handle)
+    #define AFB_ClientCtxClear(request) afb_req_context_clear(request)
+
+    #define AFB_ReqSetLOA(request, level) afb_req_session_set_LOA(request, level)
+
+    #define AFB_NewApi afb_api_new_api
+
+    #define  AFB_ApiAddVerb afb_api_add_verb
+
+    #define AFB_ApiSetUserData afb_api_set_userdata
+    #define AFB_ApiGetUserData afb_api_get_userdata
+
+    #define AFB_ApiOnEvent afb_api_on_event
+    #define AFB_ApiOnInit afb_api_on_init
+    #define AFB_ApiSeal afb_api_seal
+
     typedef struct {
             const char *verb;                       /* name of the verb, NULL only at end of the array */
             void (*callback)(AFB_ReqT req);   /* callback function implementing the verb */
@@ -86,7 +174,7 @@
             uint32_t session;
     } AFB_ApiVerbs;
 
-#elif(AFB_BINDING_VERSION == 2)
+#else
     #include <afb/afb-binding.h>
 
     typedef struct afb_req AFB_ReqT;
@@ -118,7 +206,7 @@
     #define AFB_ApiError(api, ...)    AFB_ERROR (__VA_ARGS__)
     #define AFB_ApiInfo(api, ...)     AFB_INFO (__VA_ARGS__)
 
-     #define AFB_GetApiSettings(api) json_object_new_object()
+    #define AFB_GetApiSettings(api) json_object_new_object()
 
     #define AFB_ReqIsValid(request)   afb_req_is_valid(request)
     #define AFB_EvtIsValid(evtHandle) afb_event_is_valid(evtHandle)
@@ -130,6 +218,7 @@
 
     #define AFB_GetEventLoop(api) afb_daemon_get_event_loop()
     #define AFB_RootDirGetFD(api) afb_daemon_rootdir_get_fd()
+    #define AFB_ReqVCBData afb_req_get_vcbdata
 
     #define AFB_ReqSetLOA(request, level) afb_req_session_set_LOA(request, level)