X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=bcd8dbe03161355ca3d3a76911999334da19e7d6;hb=5c1e761a2f84439b6e53ff1682ee665a7db2bca1;hp=cc3447ab856b79796833c5bf764966df586f5a2e;hpb=65bc678960567038ca4d07d1f9c5784b6c7a7834;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so.c b/src/afb-api-so.c index cc3447ab..bcd8dbe0 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "session.h" #include "afb-common.h" @@ -48,9 +48,9 @@ struct api_so_desc { static int api_timeout = 15; -static const char plugin_register_function[] = "pluginAfbV1Entry"; +static const char plugin_register_function[] = "pluginAfbV1Register"; -static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, struct json_object *object) +static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *name, struct json_object *object) { size_t length; char *event; @@ -64,17 +64,17 @@ static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, st ctxClientEventSend(NULL, event, object); } -static const struct afb_evmgr_itf evmgr_itf = { - .push = (void*)afb_api_so_evmgr_push +static const struct afb_event_sender_itf event_sender_itf = { + .push = (void*)afb_api_so_event_sender_push }; -static struct afb_evmgr afb_api_so_get_evmgr(struct api_so_desc *desc) +static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *desc) { - return (struct afb_evmgr){ .itf = &evmgr_itf, .closure = desc }; + return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc }; } static const struct afb_daemon_itf daemon_itf = { - .get_evmgr = (void*)afb_api_so_get_evmgr, + .get_event_sender = (void*)afb_api_so_get_event_sender, .get_event_loop = (void*)afb_common_get_event_loop, .get_user_bus = (void*)afb_common_get_user_bus, .get_system_bus = (void*)afb_common_get_system_bus @@ -187,6 +187,10 @@ int afb_api_so_add_plugin(const char *path) ERROR("plugin [%s] bad prefix...", path); goto error3; } + if (!afb_apis_is_valid_api_name(desc->plugin->v1.prefix)) { + ERROR("plugin [%s] invalid prefix...", path); + goto error3; + } if (desc->plugin->v1.info == NULL || *desc->plugin->v1.info == 0) { ERROR("plugin [%s] bad description...", path); goto error3;