X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsamples%2FHelloWorld.c;h=78a1eafd9a54bb562c740b69ae0d2ebde3c3d1d8;hb=031601a0c5aa944493660f991d66702cc7e52755;hp=01275aa35778cf165e32a03c4075d7d987206f8e;hpb=dde70b62b09f49ad672c104a3f81714bf11047be;p=src%2Fapp-framework-binder.git
diff --git a/plugins/samples/HelloWorld.c b/plugins/samples/HelloWorld.c
index 01275aa3..78a1eafd 100644
--- a/plugins/samples/HelloWorld.c
+++ b/plugins/samples/HelloWorld.c
@@ -1,68 +1,66 @@
/*
- * 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 "local-def.h"
-#include "afb-req-itf.h"
+#include
-static json_object* ping (AFB_request *request, json_object *jresp) {
- static int pingcount = 0;
- char query [512];
- size_t len;
+const struct AFB_interface *interface;
- // request all query key/value
- len = getQueryAll (request, query, sizeof(query));
- if (len == 0) strcpy (query,"NoSearchQueryList");
-
- // return response to caller
-// response = jsonNewMessage(AFB_SUCCESS, "Ping Binder Daemon %d query={%s}", pingcount++, query);
- afb_req_success_f(*request->areq, jresp, "Ping Binder Daemon %d query={%s}", pingcount++, query);
-
- if (verbose) fprintf(stderr, "%d: \n", pingcount);
- return jresp;
+// Sample Generic Ping Debug API
+static void ping(struct afb_req request, json_object *jresp, const char *tag)
+{
+ 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 json_object* pingSample (AFB_request *request) {
- return ping(request, json_object_new_string ("Some String"));
+static void pingSample (struct afb_req request)
+{
+ ping(request, json_object_new_string ("Some String"), "pingSample");
}
-static json_object* pingFail (AFB_request *request) {
- return ping(request, NULL);
+static void pingFail (struct afb_req request)
+{
+ afb_req_fail(request, "failed", "Ping Binder Daemon fails");
}
-static json_object* pingBug (AFB_request *request) {
- int a,b,c;
-
- fprintf (stderr, "Use --timeout=10 to trap error\n");
- b=4;
- c=0;
- a=b/c;
-
- // should never return
- return NULL;
+static void pingNull (struct afb_req request)
+{
+ ping(request, NULL, "pingNull");
+}
+
+static void pingBug (struct afb_req request)
+{
+ ping((struct afb_req){NULL,NULL,NULL}, NULL, "pingBug");
+}
+
+static void pingEvent(struct afb_req request)
+{
+ json_object *query = afb_req_json(request);
+ afb_event_sender_push(afb_daemon_get_event_sender(interface->daemon), "event", query);
+ ping(request, json_object_get(query), "event");
}
// For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/
-static json_object* pingJson (AFB_request *request) {
+static void pingJson (struct afb_req request) {
json_object *jresp, *embed;
jresp = json_object_new_object();
@@ -75,26 +73,32 @@ static json_object* pingJson (AFB_request *request) {
json_object_object_add(jresp,"eobj", embed);
- return ping(request, jresp);
+ ping(request, jresp, "pingJson");
}
// 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 AFB_restapi pluginApis[]= {
- {"ping" , AFB_SESSION_NONE, (AFB_apiCB)pingSample , "Ping Application Framework"},
- {"pingnull" , AFB_SESSION_NONE, (AFB_apiCB)pingFail , "Return NULL"},
- {"pingbug" , AFB_SESSION_NONE, (AFB_apiCB)pingBug , "Do a Memory Violation"},
- {"pingJson" , AFB_SESSION_NONE, (AFB_apiCB)pingJson , "Return a JSON object"},
+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"},
{NULL}
};
-static const AFB_plugin plugin = {
- .type = AFB_PLUGIN_JSON,
- .info = "Minimal Hello World Sample",
- .prefix = "hello",
- .apis = pluginApis
+static const struct AFB_plugin plugin_desc = {
+ .type = AFB_PLUGIN_VERSION_1,
+ .v1 = {
+ .info = "Minimal Hello World Sample",
+ .prefix = "hello",
+ .verbs = verbs
+ }
};
-const AFB_plugin *pluginRegister () {
- return &plugin;
-};
+const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+{
+ interface = itf;
+ return &plugin_desc;
+}