X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsamples%2FClientCtx.c;h=0ea880871ba6783a308ba2ef3a3013b945a6d863;hb=fb230eee946673ed5ebe9659d623c2a06d0a80ce;hp=b4ac0e131bbfd78453278d683110850a4345dc2b;hpb=06d422d1de5c505366f6a029d8af85548c2b646f;p=src%2Fapp-framework-binder.git
diff --git a/plugins/samples/ClientCtx.c b/plugins/samples/ClientCtx.c
index b4ac0e13..0ea88087 100644
--- a/plugins/samples/ClientCtx.c
+++ b/plugins/samples/ClientCtx.c
@@ -16,8 +16,12 @@
* along with this program. If not, see .
*/
+#define _GNU_SOURCE
+#include
+#include
-#include "local-def.h"
+#include "afb-plugin.h"
+#include "afb-req-itf.h"
typedef struct {
/*
@@ -56,61 +60,56 @@ typedef struct {
} MyClientContextT;
-
+// Plugin handle should not be in stack (malloc or static)
+static MyPluginHandleT global_handle;
+
// This function is call at session open time. Any client trying to
// call it with an already open session will be denied.
// Ex: http://localhost:1234/api/context/create?token=123456789
-STATIC json_object* myCreate (AFB_request *request) {
- json_object *jresp;
-
- MyClientContextT *ctx= malloc (sizeof (MyClientContextT));
- MyPluginHandleT *handle = (MyPluginHandleT*) request->handle;
+static void myCreate (struct afb_req request)
+{
+ MyClientContextT *ctx = malloc (sizeof (MyClientContextT));
+ MyPluginHandleT *handle = (MyPluginHandleT*) &global_handle;
// store something in our plugin private client context
ctx->count = 0;
ctx->abcd = "SomeThingUseful";
- request->context = ctx;
- jresp = jsonNewMessage(AFB_SUCCESS, "SUCCESS: create client context for plugin [%s]", handle->anythingYouWant);
-
- return jresp;
+ *request.context = ctx;
+ afb_req_success_f(request, NULL, "SUCCESS: create client context for plugin [%s]", handle->anythingYouWant);
}
// This function can only be called with a valid token. Token should be renew before
// session timeout a standard renew api is avaliable at /api/token/renew this API
// can be called automatically with HTML5 widget.
// ex: http://localhost:1234/api/context/action?token=xxxxxx-xxxxxx-xxxxx-xxxxx-xxxxxx
-STATIC json_object* myAction (AFB_request *request) {
- json_object* jresp;
- MyPluginHandleT *handle = (MyPluginHandleT*) request->handle;
- MyClientContextT *ctx= (MyClientContextT*) request->context;
+static void myAction (struct afb_req request)
+{
+ MyPluginHandleT *handle = (MyPluginHandleT*) &global_handle;
+ MyClientContextT *ctx = (MyClientContextT*) *request.context;
// store something in our plugin private client context
ctx->count++;
- jresp = jsonNewMessage(AFB_SUCCESS, "SUCCESS: plugin [%s] Check=[%d]\n", handle->anythingYouWant, ctx->count);
-
- return jresp;
+ afb_req_success_f(request, NULL, "SUCCESS: plugin [%s] Check=[%d]\n", handle->anythingYouWant, ctx->count);
}
// After execution of this function, client session will be close and if they
// created a context [request->context != NULL] every plugins will be notified
// that they should free context resources.
// ex: http://localhost:1234/api/context/close?token=xxxxxx-xxxxxx-xxxxx-xxxxx-xxxxxx
-STATIC json_object* myClose (AFB_request *request) {
- json_object* jresp;
- MyPluginHandleT *handle = (MyPluginHandleT*) request->handle;
- MyClientContextT *ctx= (MyClientContextT*) request->context;
+static void myClose (struct afb_req request)
+{
+ MyPluginHandleT *handle = (MyPluginHandleT*) &global_handle;
+ MyClientContextT *ctx = (MyClientContextT*) *request.context;
// store something in our plugin private client context
ctx->count++;
- jresp = jsonNewMessage(AFB_SUCCESS, "SUCCESS: plugin [%s] Close=[%d]\n", handle->anythingYouWant, ctx->count);
-
- // Note Context resource should be free in FreeCtxCB and not here in case session timeout.
- return jresp;
+ afb_req_success_f(request, NULL, "SUCCESS: plugin [%s] Close=[%d]\n", handle->anythingYouWant, ctx->count);
}
-STATIC void freeCtxCB (MyClientContextT *ctx, MyPluginHandleT *handle, char *uuid) {
- fprintf (stderr, "FreeCtxCB uuid=[%s] Plugin=[%s] count=[%d]", uuid, handle->anythingYouWant, ctx->count);
+static void freeCtxCB (MyClientContextT *ctx) {
+ MyPluginHandleT *handle = (MyPluginHandleT*) &global_handle;
+ fprintf (stderr, "FreeCtxCB Plugin=[%s] count=[%d]", (char*)handle->anythingYouWant, ctx->count);
free (ctx);
// Note: handle should be free it is a static resource attached to plugin and not to session
@@ -118,28 +117,24 @@ STATIC void freeCtxCB (MyClientContextT *ctx, MyPluginHandleT *handle, char *uui
// 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[]= {
- {"create", AFB_SESSION_CREATE, (AFB_apiCB)myCreate , "Create a new session"},
- {"action", AFB_SESSION_CHECK , (AFB_apiCB)myAction , "Use Session Context"},
- {"close" , AFB_SESSION_CLOSE , (AFB_apiCB)myClose , "Free Context"},
+static const struct AFB_restapi pluginApis[]= {
+ {"create", AFB_SESSION_CREATE, myCreate , "Create a new session"},
+ {"action", AFB_SESSION_CHECK , myAction , "Use Session Context"},
+ {"close" , AFB_SESSION_CLOSE , myClose , "Free Context"},
{NULL}
};
-PUBLIC AFB_plugin *pluginRegister () {
-
- // Plugin handle should not be in stack (malloc or static)
- STATIC MyPluginHandleT handle;
-
- AFB_plugin *plugin = malloc (sizeof (AFB_plugin));
- plugin->type = AFB_PLUGIN_JSON;
- plugin->info = "Sample of Client Context Usage";
- plugin->prefix = "context";
- plugin->apis = pluginApis;
- plugin->handle = &handle;
- plugin->freeCtxCB= (AFB_freeCtxCB) freeCtxCB;
-
- // feed plugin handle before returning from registration
- handle.anythingYouWant = "My Plugin Handle";
-
- return (plugin);
+static const struct AFB_plugin plugin_desc = {
+ .type = AFB_PLUGIN_JSON,
+ .info = "Sample of Client Context Usage",
+ .prefix = "context",
+ .apis = pluginApis,
+ .freeCtxCB = (void*)freeCtxCB
};
+
+const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf)
+{
+ global_handle.anythingYouWant = "anythingYouWant";
+ return &plugin_desc;
+}
+