X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsamples%2FHelloWorld.c;h=fd780e20981fafb38e2d1f60c44e141e7ff13a25;hb=fc19b7d7974f9c64dffc40e180464d595a9805cd;hp=85e92f45e72364a95af969ba2719d26b57275e5c;hpb=bbe18a624f4961165cf52d7f4c25de6f3a7ec012;p=src%2Fapp-framework-binder.git

diff --git a/plugins/samples/HelloWorld.c b/plugins/samples/HelloWorld.c
index 85e92f45..fd780e20 100644
--- a/plugins/samples/HelloWorld.c
+++ b/plugins/samples/HelloWorld.c
@@ -15,50 +15,61 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
+#include <json.h>
 
-#include "local-def.h"
+#include "afb-plugin.h"
 #include "afb-req-itf.h"
 
-static json_object* pingSample (AFB_request *request) {
+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 : "<empty-string>", obj);
+    return 1; /* continue to iterate */
+}
+
+// Sample Generic Ping Debug API
+static void ping(struct afb_req request, json_object *jresp)
+{
     static int pingcount = 0;
-    json_object *response;
-    char query [512];
-    size_t len;
+    json_object *query;
 
-    // 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, NULL, "Ping Binder Daemon %d query={%s}", pingcount++, query);
-    
-    if (verbose) fprintf(stderr, "%d: \n", pingcount);
-    return NULL; //(response);
+    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 json_object* pingFail (AFB_request *request) {
-    return NULL;
+static void pingSample (struct afb_req request)
+{
+	ping(request, json_object_new_string ("Some String"));
 }
 
-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 pingFail (struct afb_req request)
+{
+	afb_req_fail(request, "failed", "Ping Binder Daemon fails");
+}
+
+static void pingNull (struct afb_req request)
+{
+	ping(request, NULL);
+}
+
+static void pingBug (struct afb_req request)
+{
+	pingNull((struct afb_req){NULL,NULL,NULL});
 }
 
 
 // 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();
@@ -70,27 +81,29 @@ 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);
 }
 
 // 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_restapi pluginApis[]= {
+  {"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"},
   {NULL}
 };
 
-static const AFB_plugin plugin = {
+static const struct AFB_plugin plugin_desc = {
 	.type = AFB_PLUGIN_JSON,
 	.info = "Minimal Hello World Sample",
 	.prefix = "hello",
 	.apis = pluginApis
 };
 
-const AFB_plugin *pluginRegister () {
-    return &plugin;
-};
+const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf)
+{
+	return &plugin_desc;
+}