X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsamples%2FHelloWorld.c;h=fe11784618506c113f694125dd853431761ff867;hb=1a66f6a8c0b213e14bc0b1896bfaa68a5c2a5002;hp=2714ef4e6a6a607f883c0fffcfe1a3c6acacc2ef;hpb=3bbfb37bb4572a110122b1a83e21261108a65460;p=src%2Fapp-framework-binder.git diff --git a/plugins/samples/HelloWorld.c b/plugins/samples/HelloWorld.c index 2714ef4e..fe117846 100644 --- a/plugins/samples/HelloWorld.c +++ b/plugins/samples/HelloWorld.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 "IoT.bzh" + * Copyright (C) 2015, 2016 "IoT.bzh" * Author "Fulup Ar Foll" * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,9 +17,9 @@ #define _GNU_SOURCE #include #include -#include +#include -#include "afb-plugin.h" +#include const struct AFB_interface *interface; @@ -54,8 +54,8 @@ static void pingBug (struct afb_req request) static void pingEvent(struct afb_req request) { json_object *query = afb_req_json(request); - afb_evmgr_push(afb_daemon_get_evmgr(interface->daemon), "event", query); - ping(request, json_object_get(query), "event"); + afb_daemon_broadcast_event(interface->daemon, "event", json_object_get(query)); + ping(request, query, "event"); } @@ -78,7 +78,7 @@ static void pingJson (struct afb_req request) { // NOTE: this sample does not use session to keep test a basic as possible // in real application most APIs should be protected with AFB_SESSION_CHECK -static const struct AFB_restapi pluginApis[]= { +static const struct AFB_verb_desc_v1 verbs[]= { {"ping" , AFB_SESSION_NONE, pingSample , "Ping Application Framework"}, {"pingfail" , AFB_SESSION_NONE, pingFail , "Fails"}, {"pingnull" , AFB_SESSION_NONE, pingNull , "Return NULL"}, @@ -89,13 +89,15 @@ static const struct AFB_restapi pluginApis[]= { }; static const struct AFB_plugin plugin_desc = { - .type = AFB_PLUGIN_JSON, - .info = "Minimal Hello World Sample", - .prefix = "hello", - .apis = pluginApis + .type = AFB_PLUGIN_VERSION_1, + .v1 = { + .info = "Minimal Hello World Sample", + .prefix = "hello", + .verbs = verbs + } }; -const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf) +const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf) { interface = itf; return &plugin_desc;