diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-02 14:59:25 +0200 |
---|---|---|
committer | Clément Bénier <clement.benier@iot.bzh> | 2018-10-05 14:36:45 +0200 |
commit | 1d757228d9acb1d09ce966fe68b87fc067b9d9af (patch) | |
tree | f8efe1d90b570f6dd10ff6e09634fc58a4d3e527 /ctl-lib/ctl-event.c | |
parent | 625ce776e0e9ed869da90659eb988ee32de4cf3b (diff) |
Get rid of the support of API version 2 and DYNAPI
Change-Id: I24d99de6fe5d1d639392315926ca23f60a137fc4
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'ctl-lib/ctl-event.c')
-rw-r--r-- | ctl-lib/ctl-event.c | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/ctl-lib/ctl-event.c b/ctl-lib/ctl-event.c index 1bed333..37590b2 100644 --- a/ctl-lib/ctl-event.c +++ b/ctl-lib/ctl-event.c @@ -23,18 +23,13 @@ #include "ctl-config.h" // Event dynamic API-V3 mode -#if defined AFB_BINDING_PREV3 || AFB_BINDING_VERSION == 3 -void CtrlDispatchApiEvent (AFB_ApiT apiHandle, const char *evtLabel, struct json_object *eventJ) { +void CtrlDispatchApiEvent (afb_api_t apiHandle, const char *evtLabel, struct json_object *eventJ) { int idx = 0; CtlActionT* actions = NULL; - AFB_ApiDebug (apiHandle, "Received event=%s, query=%s", evtLabel, json_object_get_string(eventJ)); + AFB_API_DEBUG (apiHandle, "Received event=%s, query=%s", evtLabel, json_object_get_string(eventJ)); // retrieve section config from api handle - #ifdef AFB_BINDING_PREV3 - CtlConfigT *ctrlConfig = (CtlConfigT*) afb_dynapi_get_userdata(apiHandle); - #elif AFB_BINDING_VERSION == 3 CtlConfigT *ctrlConfig = (CtlConfigT*) afb_api_get_userdata(apiHandle); - #endif for (idx = 0; ctrlConfig->sections[idx].key != NULL; ++idx) { @@ -46,7 +41,7 @@ void CtrlDispatchApiEvent (AFB_ApiT apiHandle, const char *evtLabel, struct json idx = ActionLabelToIndex(actions, evtLabel); if (idx < 0) { - AFB_ApiWarning(apiHandle, "CtlDispatchEvent: fail to find uid=%s in action event section", evtLabel); + AFB_API_WARNING(apiHandle, "CtlDispatchEvent: fail to find uid=%s in action event section", evtLabel); return; } @@ -60,37 +55,14 @@ void CtrlDispatchApiEvent (AFB_ApiT apiHandle, const char *evtLabel, struct json (void) ActionExecOne (&source, &actions[idx], json_object_get(eventJ)); } -#else -// In API-V2 controller config is unique and static -extern CtlConfigT *ctrlConfig; - -// call action attached to even name if any -void CtrlDispatchV2Event(const char *evtLabel, json_object *eventJ) { - CtlActionT* actions = ctrlConfig->sections[CTL_SECTION_EVENT].actions; - - int index= ActionLabelToIndex(actions, evtLabel); - if (index < 0) { - AFB_WARNING_V2("CtlDispatchEvent: fail to find uid=%s in action event section", evtLabel); - return; - } - - CtlSourceT source; - source.uid = actions[index].uid; - source.api = actions[index].api; - source.request = AFB_ReqNone; - - // Best effort ignoring error to exec corresponding action - (void) ActionExecOne (&source, &actions[index], json_object_get(eventJ)); -} -#endif // onload section receive one action or an array of actions -int EventConfig(AFB_ApiT apiHandle, CtlSectionT *section, json_object *actionsJ) { +int EventConfig(afb_api_t apiHandle, CtlSectionT *section, json_object *actionsJ) { int err = 0; // Load time parse actions in config file if (actionsJ != NULL) { if ( (err= AddActionsToSection(apiHandle, section, actionsJ, 0)) ) { - AFB_ApiError (apiHandle, "EventLoad config fail processing actions for section %s", section->uid); + AFB_API_ERROR (apiHandle, "EventLoad config fail processing actions for section %s", section->uid); return err; } } |