Factorize common code for handling requests

[src/app-framework-binder.git] / bindings / samples / HelloWorld.c

diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c
index b6f49b7..cb4a5a4 100644 (file)
--- a/bindings/samples/HelloWorld.c
+++ b/bindings/samples/HelloWorld.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
  * Author "Fulup Ar Foll"
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +19,9 @@
 #include <string.h>
 #include <json-c/json.h>
 
-#include <afb/afb-plugin.h>
+#include <afb/afb-binding.h>
 
-const struct AFB_interface *interface;
+const struct afb_binding_interface *interface;
 
 struct event
 {
@@ -131,7 +131,7 @@ static void pingNull (struct afb_req request)
 
 static void pingBug (struct afb_req request)
 {
-       ping((struct afb_req){NULL,NULL,NULL}, NULL, "pingBug");
+       ping((struct afb_req){NULL,NULL}, NULL, "pingBug");
 }
 
 static void pingEvent(struct afb_req request)
@@ -144,16 +144,16 @@ static void pingEvent(struct afb_req request)
 
 // For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/
 static void pingJson (struct afb_req request) {
-    json_object *jresp, *embed;    
-    
+    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);
 
     ping(request, jresp, "pingJson");
@@ -245,9 +245,14 @@ static void eventpush (struct afb_req request)
                afb_req_success(request, NULL, NULL);
 }
 
+static void exitnow (struct afb_req request)
+{
+       exit(0);
+}
+
 // 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 const struct AFB_verb_desc_v1 verbs[]= {
+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"},
@@ -260,11 +265,12 @@ static const struct AFB_verb_desc_v1 verbs[]= {
   {"eventsub",  AFB_SESSION_NONE, eventsub    , "subscribes to the event of 'tag'"},
   {"eventunsub",AFB_SESSION_NONE, eventunsub  , "unsubscribes to the event of 'tag'"},
   {"eventpush", AFB_SESSION_NONE, eventpush   , "pushs the event of 'tag' with the 'data'"},
+  {"exit",      AFB_SESSION_NONE, exitnow     , "exits from afb-daemon"},
   {NULL}
 };
 
-static const struct AFB_plugin plugin_desc = {
-       .type = AFB_PLUGIN_VERSION_1,
+static const struct afb_binding plugin_desc = {
+       .type = AFB_BINDING_VERSION_1,
        .v1 = {
                .info = "Minimal Hello World Sample",
                .prefix = "hello",
@@ -272,7 +278,7 @@ static const struct AFB_plugin plugin_desc = {
        }
 };
 
-const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
 {
        interface = itf;
        return &plugin_desc;