Templates separation between binding API hat and Callbacks

Change-Id: I4c405c0ae02f50f03f9b4e71ebbdcd74f51e4ac8
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/templates/hybrid-html5/binding/xxx-cb.c b/templates/hybrid-html5/binding/xxx-cb.c
new file mode 100644 (file)
index 0000000..12d7fa6
--- /dev/null
+++ b/templates/hybrid-html5/binding/xxx-cb.c
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Author "Manuel Bachmann"
+ *
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 <json-c/json.h>
+
+#include <afb/afb-binding.h>
+#include "xxx-hat.h"
+
+void ping (struct afb_req request)
+{
+       static int pingcount = 0;
+
+       json_object *query = afb_req_json(request);
+       afb_req_success_f(request, NULL, "Ping Binder Daemon count=%d query=%s", ++pingcount, json_object_to_json_string(query));
+}

diff --git a/templates/hybrid-html5/binding/xxxxxx-hybrid-binding.c b/templates/hybrid-html5/binding/xxx-hat.c
similarity index 81%
rename from templates/hybrid-html5/binding/xxxxxx-hybrid-binding.c
rename to templates/hybrid-html5/binding/xxx-hat.c
index de6a78e..ffdc2c1 100644 (file)
--- a/templates/hybrid-html5/binding/xxxxxx-hybrid-binding.c
+++ b/templates/hybrid-html5/binding/xxx-hat.c
@@ -18,16 +18,9 @@
 #include <json-c/json.h>
 
 #include <afb/afb-binding.h>
+#include "xxx-hat.h"
 
-const struct afb_binding_interface *interface;
-
-static void ping (struct afb_req request)
-{
-       static int pingcount = 0;
-
-       json_object *query = afb_req_json(request);
-       afb_req_success_f(request, NULL, "Ping Binder Daemon count=%d query=%s", ++pingcount, json_object_to_json_string(query));
-}
+const struct afb_binding_interface* interface;
 
 // 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

diff --git a/templates/hybrid-html5/binding/xxx-hat.h b/templates/hybrid-html5/binding/xxx-hat.h
new file mode 100644 (file)
index 0000000..b4dd89e
--- /dev/null
+++ b/templates/hybrid-html5/binding/xxx-hat.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Author "Manuel Bachmann"
+ *
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+ #ifndef BINDINGHAT_H
+ #define BINDINGHAT_H
+
+#define _GNU_SOURCE
+#include <json-c/json.h>
+
+#include <afb/afb-binding.h>
+
+extern const struct afb_binding_interface *interface;
+
+void ping (struct afb_req request);
+
+#endif
\ No newline at end of file

diff --git a/templates/native/app/xxxxxx-native-client.c b/templates/native/app/xxx-native-app.c
similarity index 100%
rename from templates/native/app/xxxxxx-native-client.c
rename to templates/native/app/xxx-native-app.c

diff --git a/templates/service/binding/xxxxxx-service-binding.c b/templates/service/binding/xxx-service-cb.c
similarity index 65%
rename from templates/service/binding/xxxxxx-service-binding.c
rename to templates/service/binding/xxx-service-cb.c
index 5e823d2..9b765ed 100644 (file)
--- a/templates/service/binding/xxxxxx-service-binding.c
+++ b/templates/service/binding/xxx-service-cb.c
@@ -14,26 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
 #include <json-c/json.h>
 
 #include <afb/afb-binding.h>
-
-const struct afb_binding_interface *interface;
-
-struct event
-{
-       struct event *next;
-       struct afb_event event;
-       char tag[1];
-};
-
-static struct event *events = 0;
+ #include "xxx-service-hat.h"
+ 
+ const struct afb_binding_interface *interface;
+ 
+ static struct event *events = 0;
 
 /* searchs the event of tag */
-static struct event *event_get(const char *tag)
+ struct event *event_get(const char *tag)
 {
        struct event *e = events;
        while(e && strcmp(e->tag, tag))
@@ -42,7 +37,7 @@ static struct event *event_get(const char *tag)
 }
 
 /* deletes the event of tag */
-static int event_del(const char *tag)
+ int event_del(const char *tag)
 {
        struct event *e, **p;
 
@@ -62,7 +57,7 @@ static int event_del(const char *tag)
 }
 
 /* creates the event of tag */
-static int event_add(const char *tag, const char *name)
+ int event_add(const char *tag, const char *name)
 {
        struct event *e;
 
@@ -85,21 +80,21 @@ static int event_add(const char *tag, const char *name)
        return 0;
 }
 
-static int event_subscribe(struct afb_req request, const char *tag)
+ int event_subscribe(struct afb_req request, const char *tag)
 {
        struct event *e;
        e = event_get(tag);
        return e ? afb_req_subscribe(request, e->event) : -1;
 }
 
-static int event_unsubscribe(struct afb_req request, const char *tag)
+ int event_unsubscribe(struct afb_req request, const char *tag)
 {
        struct event *e;
        e = event_get(tag);
        return e ? afb_req_unsubscribe(request, e->event) : -1;
 }
 
-static int event_push(struct json_object *args, const char *tag)
+ int event_push(struct json_object *args, const char *tag)
 {
        struct event *e;
        e = event_get(tag);
@@ -107,34 +102,34 @@ static int event_push(struct json_object *args, const char *tag)
 }
 
 // Sample Generic Ping Debug API
-static void ping(struct afb_req request, json_object *jresp, const char *tag)
+ static void ping(struct afb_req request, json_object *jresp, const char *tag)
 {
-       static int pingcount = 0;
+        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));
 }
 
-static void pingSample (struct afb_req request)
+ void pingSample (struct afb_req request)
 {
        ping(request, json_object_new_string ("Some String"), "pingSample");
 }
 
-static void pingFail (struct afb_req request)
+ void pingFail (struct afb_req request)
 {
        afb_req_fail(request, "failed", "Ping Binder Daemon fails");
 }
 
-static void pingNull (struct afb_req request)
+ void pingNull (struct afb_req request)
 {
        ping(request, NULL, "pingNull");
 }
 
-static void pingBug (struct afb_req request)
+ 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)
+ void pingEvent(struct afb_req request)
 {
        json_object *query = afb_req_json(request);
        afb_daemon_broadcast_event(interface->daemon, "event", json_object_get(query));
@@ -143,7 +138,7 @@ 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) {
+ void pingJson (struct afb_req request) {
     json_object *jresp, *embed;
 
     jresp = json_object_new_object();
@@ -159,7 +154,7 @@ static void pingJson (struct afb_req request) {
     ping(request, jresp, "pingJson");
 }
 
-static void subcallcb (void *prequest, int iserror, json_object *object)
+ void subcallcb (void *prequest, int iserror, json_object *object)
 {
        struct afb_req request = afb_req_unstore(prequest);
        if (iserror)
@@ -169,7 +164,7 @@ static void subcallcb (void *prequest, int iserror, json_object *object)
        afb_req_unref(request);
 }
 
-static void subcall (struct afb_req request)
+ void subcall (struct afb_req request)
 {
        const char *api = afb_req_value(request, "api");
        const char *verb = afb_req_value(request, "verb");
@@ -182,7 +177,7 @@ static void subcall (struct afb_req request)
                afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(request));
 }
 
-static void eventadd (struct afb_req request)
+ void eventadd (struct afb_req request)
 {
        const char *tag = afb_req_value(request, "tag");
        const char *name = afb_req_value(request, "name");
@@ -195,7 +190,7 @@ static void eventadd (struct afb_req request)
                afb_req_success(request, NULL, NULL);
 }
 
-static void eventdel (struct afb_req request)
+ void eventdel (struct afb_req request)
 {
        const char *tag = afb_req_value(request, "tag");
 
@@ -207,7 +202,7 @@ static void eventdel (struct afb_req request)
                afb_req_success(request, NULL, NULL);
 }
 
-static void eventsub (struct afb_req request)
+ void eventsub (struct afb_req request)
 {
        const char *tag = afb_req_value(request, "tag");
 
@@ -219,7 +214,7 @@ static void eventsub (struct afb_req request)
                afb_req_success(request, NULL, NULL);
 }
 
-static void eventunsub (struct afb_req request)
+ void eventunsub (struct afb_req request)
 {
        const char *tag = afb_req_value(request, "tag");
 
@@ -231,7 +226,7 @@ static void eventunsub (struct afb_req request)
                afb_req_success(request, NULL, NULL);
 }
 
-static void eventpush (struct afb_req request)
+ void eventpush (struct afb_req request)
 {
        const char *tag = afb_req_value(request, "tag");
        const char *data = afb_req_value(request, "data");
@@ -243,37 +238,4 @@ static void eventpush (struct afb_req request)
                afb_req_fail(request, "failed", "push error");
        else
                afb_req_success(request, NULL, NULL);
-}
-
-// 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[]= {
-  {"ping"     , AFB_SESSION_NONE, pingSample  , "Ping the binder"},
-  {"pingfail" , AFB_SESSION_NONE, pingFail    , "Ping that fails"},
-  {"pingnull" , AFB_SESSION_NONE, pingNull    , "Ping which returns 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"},
-  {"subcall",   AFB_SESSION_NONE, subcall     , "Call api/verb(args)"},
-  {"eventadd",  AFB_SESSION_NONE, eventadd    , "adds the event of 'name' for the 'tag'"},
-  {"eventdel",  AFB_SESSION_NONE, eventdel    , "deletes the event of 'tag'"},
-  {"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   , "pushes the event of 'tag' with the 'data'"},
-  {NULL}
-};
-
-static const struct afb_binding plugin_desc = {
-       .type = AFB_BINDING_VERSION_1,
-       .v1 = {
-               .info = "xxxxxx service",
-               .prefix = "xxxxxx",
-               .verbs = verbs
-       }
-};
-
-const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
-{
-       interface = itf;
-       return &plugin_desc;
-}
+}
\ No newline at end of file

diff --git a/templates/service/binding/xxx-service-hat.c b/templates/service/binding/xxx-service-hat.c
new file mode 100644 (file)
index 0000000..2e172e8
--- /dev/null
+++ b/templates/service/binding/xxx-service-hat.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Author "Fulup Ar Foll"
+ *
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 <stdio.h>
+#include <string.h>
+#include <json-c/json.h>
+
+#include <afb/afb-binding.h>
+#include "xxx-service-hat.h"
+
+const struct afb_binding_interface *interface;
+
+// 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[]= {
+  {"ping"     , AFB_SESSION_NONE, pingSample  , "Ping the binder"},
+  {"pingfail" , AFB_SESSION_NONE, pingFail    , "Ping that fails"},
+  {"pingnull" , AFB_SESSION_NONE, pingNull    , "Ping which returns 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"},
+  {"subcall",   AFB_SESSION_NONE, subcall     , "Call api/verb(args)"},
+  {"eventadd",  AFB_SESSION_NONE, eventadd    , "adds the event of 'name' for the 'tag'"},
+  {"eventdel",  AFB_SESSION_NONE, eventdel    , "deletes the event of 'tag'"},
+  {"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   , "pushes the event of 'tag' with the 'data'"},
+  {NULL}
+};
+
+static const struct afb_binding plugin_desc = {
+       .type = AFB_BINDING_VERSION_1,
+       .v1 = {
+               .info = "xxxxxx service",
+               .prefix = "xxxxxx",
+               .verbs = verbs
+       }
+};
+
+const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
+{
+       interface = itf;
+       return &plugin_desc;
+}

diff --git a/templates/service/binding/xxx-service-hat.h b/templates/service/binding/xxx-service-hat.h
new file mode 100644 (file)
index 0000000..a80c0c2
--- /dev/null
+++ b/templates/service/binding/xxx-service-hat.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Author "Fulup Ar Foll"
+ *
+ * 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
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+#ifndef SERVICEHAT_H
+#define  SERVICEHAT_H
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <string.h>
+#include <json-c/json.h>
+
+#include <afb/afb-binding.h>
+
+extern const struct afb_binding_interface *interface;
+
+struct event
+{
+       struct event *next;
+       struct afb_event event;
+       char tag[1];
+};
+
+/* searchs the event of tag */
+struct event *event_get(const char *tag);
+
+/* deletes the event of tag */
+int event_del(const char *tag);
+
+/* creates the event of tag */
+int event_add(const char *tag, const char *name);
+
+int event_subscribe(struct afb_req request, const char *tag);
+
+int event_unsubscribe(struct afb_req request, const char *tag);
+
+int event_push(struct json_object *args, const char *tag);
+
+void pingSample (struct afb_req request);
+
+void pingFail (struct afb_req request);
+
+void pingNull (struct afb_req request);
+
+void pingBug (struct afb_req request);
+
+void pingEvent(struct afb_req request);
+
+// For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/
+void pingJson (struct afb_req request);
+
+void subcallcb (void *prequest, int iserror, json_object *object);
+
+void subcall (struct afb_req request);
+
+void eventadd (struct afb_req request);
+
+void eventdel (struct afb_req request);
+
+void eventsub (struct afb_req request);
+
+void eventunsub (struct afb_req request);
+
+void eventpush (struct afb_req request);
+
+#endif
\ No newline at end of file