X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsamples%2FHelloWorld.c;h=35b95cab0e22bc903955a996813554fb075b5e1b;hb=65bc678960567038ca4d07d1f9c5784b6c7a7834;hp=d91069203a4c1b1bea34a6950f5b2e8eafe243ac;hpb=06d422d1de5c505366f6a029d8af85548c2b646f;p=src%2Fapp-framework-binder.git
diff --git a/plugins/samples/HelloWorld.c b/plugins/samples/HelloWorld.c
index d9106920..35b95cab 100644
--- a/plugins/samples/HelloWorld.c
+++ b/plugins/samples/HelloWorld.c
@@ -1,63 +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
-#include "local-def.h"
+const struct AFB_interface *interface;
-STATIC json_object* pingSample (AFB_request *request) {
- static pingcount = 0;
- json_object *response;
- char query [512];
- int len;
+// 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));
+}
- // request all query key/value
- len = getQueryAll (request, query, sizeof(query));
- if (len == 0) strcpy (query,"NoSearchQueryList");
-
- // check if we have some post data
- if (request->post == NULL) request->post->data="NoData";
-
- // return response to caller
- response = jsonNewMessage(AFB_SUCCESS, "Ping Binder Daemon %d query={%s} PostData: \'%s\' ", pingcount++, query, request->post);
-
- if (verbose) fprintf(stderr, "%d: \n", pingcount);
- return (response);
+static void pingSample (struct afb_req request)
+{
+ ping(request, json_object_new_string ("Some String"), "pingSample");
}
-STATIC json_object* pingFail (AFB_request *request) {
- return 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_evmgr_push(afb_daemon_get_evmgr(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();
@@ -69,26 +72,33 @@ STATIC json_object* pingJson (AFB_request *request) {
json_object_object_add(embed, "subObjInt", json_object_new_int (5678));
json_object_object_add(jresp,"eobj", embed);
-
- return 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}
};
-
-PUBLIC AFB_plugin *pluginRegister () {
- AFB_plugin *plugin = malloc (sizeof (AFB_plugin));
- plugin->type = AFB_PLUGIN_JSON;
- plugin->info = "Minimal Hello World Sample";
- plugin->prefix= "hello";
- plugin->apis = pluginApis;
- return (plugin);
+static const struct AFB_plugin plugin_desc = {
+ .type = AFB_PLUGIN_VERSION_1,
+ .v1 = {
+ .info = "Minimal Hello World Sample",
+ .prefix = "hello",
+ .verbs = verbs
+ }
};
+
+const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+{
+ interface = itf;
+ return &plugin_desc;
+}