X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsamples%2FHelloWorld.c;h=4f0af71fd4c0f68985ae17cdf6d625114018ae12;hb=70558f02b1c030c4290a0146313e3052fc0ea715;hp=067365dd115c79206d6e02334661bb3161e8a404;hpb=ca208671cc79bbc05c574df788035878e5d39382;p=src%2Fapp-framework-binder.git

diff --git a/plugins/samples/HelloWorld.c b/plugins/samples/HelloWorld.c
index 067365dd..4f0af71f 100644
--- a/plugins/samples/HelloWorld.c
+++ b/plugins/samples/HelloWorld.c
@@ -15,35 +15,74 @@
  * 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 "afb-plugin.h"
+#include "afb-req-itf.h"
 
-#include "local-def.h"
+typedef struct queryHandleT {
+     char    *msg;
+     size_t  idx;
+     size_t  len;
+} queryHandleT;
 
-STATIC json_object* pingSample (AFB_request *request) {
+static int getQueryCB (queryHandleT *query, struct afb_arg arg) {
+    if (query->idx >= query->len)
+	return 0;
+    query->idx += (unsigned)snprintf (&query->msg[query->idx], query->len-query->idx, " %s: %s\'%s\',", arg.name, arg.is_file?"FILE=":"", arg.value);
+    return 1; /* continue to iterate */
+}
+
+// Helper to retrieve argument from  connection
+static size_t getQueryAll(struct afb_req request, char *buffer, size_t len) {
+    queryHandleT query;
+    buffer[0] = '\0'; // start with an empty string
+    query.msg = buffer;
+    query.len = len;
+    query.idx = 0;
+
+    afb_req_iterate(request, (void*)getQueryCB, &query);
+    buffer[len-1] = 0;
+    return query.idx >= len ? len - 1 : query.idx;
+}
+
+static void ping (struct afb_req request, json_object *jresp)
+{
     static int pingcount = 0;
-    json_object *response;
     char query [512];
-    int len;
+    size_t len;
 
     // 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);
+//    response = jsonNewMessage(AFB_SUCCESS, "Ping Binder Daemon %d query={%s}", pingcount++, query);
+    afb_req_success_f(request, jresp, "Ping Binder Daemon %d query={%s}", pingcount++, query);
     
-    if (verbose) fprintf(stderr, "%d: \n", pingcount);
-    return (response);
+    fprintf(stderr, "%d: \n", pingcount);
+}
+
+static void pingSample (struct afb_req request)
+{
+	ping(request, json_object_new_string ("Some String"));
 }
 
-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) {
+static void pingNull (struct afb_req request)
+{
+	ping(request, NULL);
+}
+
+static void pingBug (struct afb_req request)
+{
     int a,b,c;
     
     fprintf (stderr, "Use --timeout=10 to trap error\n");
@@ -51,13 +90,11 @@ STATIC json_object* pingBug (AFB_request *request) {
     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_request *request) {
+static void pingJson (struct afb_req request) {
     json_object *jresp, *embed;    
     
     jresp = json_object_new_object();
@@ -69,26 +106,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}
 };
 
-
-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_JSON,
+	.info = "Minimal Hello World Sample",
+	.prefix = "hello",
+	.apis = pluginApis
 };
+
+const struct AFB_plugin *pluginRegister ()
+{
+	return &plugin_desc;
+}