X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdbus-api.c;h=f7b071bd16484c1ab98998f67d77ab270267d124;hb=1250a56369315c017abfe429c556b863730b9b44;hp=1f81bb2f7d360e38f4e686e8dd1c35b635b80f3d;hpb=b55efc33fb8df8b0518570b2584b6da9abb3221b;p=src%2Fapp-framework-binder.git

diff --git a/src/dbus-api.c b/src/dbus-api.c
index 1f81bb2f..f7b071bd 100644
--- a/src/dbus-api.c
+++ b/src/dbus-api.c
@@ -19,13 +19,15 @@
 
 #include "local-def.h"
 
-STATIC json_object* pingSample (AFB_session *session, AFB_request *request, void* handle) {
+STATIC json_object* pingSample (AFB_request *request) {
     static pingcount = 0;
     json_object *response;
     char query [512];
+    int len;
 
     // request all query key/value
-    getQueryAll (request, query, sizeof(query)); 
+    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="NoData";  
@@ -37,26 +39,57 @@ STATIC json_object* pingSample (AFB_session *session, AFB_request *request, void
     return (response);
 }
 
+STATIC json_object* pingFail (AFB_request *request) {
+    return NULL;
+}
 
-STATIC struct {
-    void * somedata;
-} handle;
+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;
+}
+
+
+// For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/
+STATIC json_object* pingJson (AFB_session *session, AFB_request *request) {
+    json_object *jresp, *embed;    
+    
+    jresp = json_object_new_object();
+    json_object_object_add(jresp, "myString", json_object_new_string ("Some String"));
+    json_object_object_add(jresp, "myInt", json_object_new_int (1234));
+     
+    embed  = json_object_new_object();
+    json_object_object_add(embed, "subObjString", json_object_new_string ("Some String"));
+    json_object_object_add(embed, "subObjInt", json_object_new_int (5678));
+    
+    json_object_object_add(jresp,"eobj", embed);
+    
+    return jresp;
+}
 
 
 STATIC  AFB_restapi pluginApis[]= {
-  {"ping"     , (AFB_apiCB)pingSample , "Ping Application Framework", NULL},
-  {"ctx-store", (AFB_apiCB)pingSample , "Verbose Mode", NULL},
-  {"ctx-load" , (AFB_apiCB)pingSample , "Verbose Mode", NULL},
-  {0,0,0}
+  {"ping"     , (AFB_apiCB)pingSample  , "Ping Application Framework"},
+  {"pingnull" , (AFB_apiCB)pingFail    , "Return NULL"},
+  {"pingbug"  , (AFB_apiCB)pingBug     , "Do a Memory Violation"},
+  {"pingJson" , (AFB_apiCB)pingJson    , "Return a JSON object"},
+  {"ctx-store", (AFB_apiCB)pingSample  , "Verbose Mode"},
+  {"ctx-load" , (AFB_apiCB)pingSample  , "Verbose Mode"},
+  {NULL}
 };
 
 
-PUBLIC AFB_plugin *dbusRegister (AFB_session *session) {
+PUBLIC AFB_plugin *dbusRegister () {
     AFB_plugin *plugin = malloc (sizeof (AFB_plugin));
-    plugin->type  = AFB_PLUGIN;
+    plugin->type  = AFB_PLUGIN_JSON;
     plugin->info  = "Application Framework Binder Service";
     plugin->prefix= "dbus";        
     plugin->apis  = pluginApis;
-    
     return (plugin);
 };
\ No newline at end of file