X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsamples%2FHelloWorld.c;h=259b42f13457cdb261546c9a3a27b9baf0217e9a;hb=b0848149c1ef5236791c0ba5196540d05d9f15fd;hp=fd780e20981fafb38e2d1f60c44e141e7ff13a25;hpb=fc19b7d7974f9c64dffc40e180464d595a9805cd;p=src%2Fapp-framework-binder.git
diff --git a/plugins/samples/HelloWorld.c b/plugins/samples/HelloWorld.c
index fd780e20..259b42f1 100644
--- a/plugins/samples/HelloWorld.c
+++ b/plugins/samples/HelloWorld.c
@@ -1,55 +1,39 @@
/*
- * Copyright (C) 2015 "IoT.bzh"
+ * Copyright (C) 2015, 2016 "IoT.bzh"
* Author "Fulup Ar Foll"
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * 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.
*/
#define _GNU_SOURCE
#include
#include
-#include
+#include
-#include "afb-plugin.h"
-#include "afb-req-itf.h"
+#include
-static int fillargs(json_object *args, struct afb_arg arg)
-{
- json_object *obj;
-
- obj = json_object_new_object();
- json_object_object_add (obj, "value", json_object_new_string(arg.value));
- json_object_object_add (obj, "path", json_object_new_string(arg.path));
- json_object_object_add (obj, "size", json_object_new_int64((int64_t)arg.size));
- json_object_object_add (args, arg.name && *arg.name ? arg.name : "", obj);
- return 1; /* continue to iterate */
-}
+const struct AFB_interface *interface;
// Sample Generic Ping Debug API
-static void ping(struct afb_req request, json_object *jresp)
+static void ping(struct afb_req request, json_object *jresp, const char *tag)
{
- static int pingcount = 0;
- json_object *query;
-
- query = json_object_new_object();
- afb_req_iterate(request, (void*)fillargs, query);
-
- afb_req_success_f(request, jresp, "Ping Binder Daemon count=%d query=%s", ++pingcount, json_object_to_json_string(query));
+ static int pingcount = 0;
+ json_object *query = afb_req_json(request);
+ afb_req_success_f(request, jresp, "Ping Binder Daemon tag=%s count=%d query=%s", tag, ++pingcount, json_object_to_json_string(query));
}
static void pingSample (struct afb_req request)
{
- ping(request, json_object_new_string ("Some String"));
+ ping(request, json_object_new_string ("Some String"), "pingSample");
}
static void pingFail (struct afb_req request)
@@ -59,12 +43,19 @@ static void pingFail (struct afb_req request)
static void pingNull (struct afb_req request)
{
- ping(request, NULL);
+ ping(request, NULL, "pingNull");
}
static void pingBug (struct afb_req request)
{
- pingNull((struct afb_req){NULL,NULL,NULL});
+ ping((struct afb_req){NULL,NULL,NULL}, NULL, "pingBug");
+}
+
+static void pingEvent(struct afb_req request)
+{
+ json_object *query = afb_req_json(request);
+ afb_daemon_broadcast_event(interface->daemon, "event", json_object_get(query));
+ ping(request, json_object_get(query), "event");
}
@@ -82,28 +73,56 @@ static void pingJson (struct afb_req request) {
json_object_object_add(jresp,"eobj", embed);
- ping(request, jresp);
+ ping(request, jresp, "pingJson");
+}
+
+static void subcallcb (void *prequest, int iserror, json_object *object)
+{
+ struct afb_req request = afb_req_unstore(prequest);
+ if (iserror)
+ afb_req_fail(request, "failed", json_object_to_json_string(object));
+ else
+ afb_req_success(request, object, NULL);
+ afb_req_unref(request);
+}
+
+static void subcall (struct afb_req request)
+{
+ const char *api = afb_req_value(request, "api");
+ const char *verb = afb_req_value(request, "verb");
+ const char *args = afb_req_value(request, "args");
+ json_object *object = api && verb && args ? json_tokener_parse(args) : NULL;
+
+ if (object == NULL)
+ afb_req_fail(request, "failed", "bad arguments");
+ else
+ afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(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"},
{"pingbug" , AFB_SESSION_NONE, pingBug , "Do a Memory Violation"},
{"pingJson" , AFB_SESSION_NONE, pingJson , "Return a JSON object"},
+ {"pingevent", AFB_SESSION_NONE, pingEvent , "Send an event"},
+ {"subcall", AFB_SESSION_NONE, subcall , "Call api/verb(args)"},
{NULL}
};
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;
}