X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fsession%2Ftoken-api.c;h=a132366fe16efa132ca0755cb0383e45a89cf916;hb=4366cce13304515986a29f3a5f06bb815397b726;hp=91f9cd8f5ceb82ff7f5ca4d84f6dcf937d5381a5;hpb=469e619ac45402471ea7d8c792ffc06e79346ef2;p=src%2Fapp-framework-binder.git

diff --git a/plugins/session/token-api.c b/plugins/session/token-api.c
index 91f9cd8f..a132366f 100644
--- a/plugins/session/token-api.c
+++ b/plugins/session/token-api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 "IoT.bzh"
+ * Copyright (C) 2015, 2016 "IoT.bzh"
  * Author "Fulup Ar Foll"
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,9 +17,9 @@
 
 #define _GNU_SOURCE
 #include <stdio.h>
-#include <json.h>
+#include <json-c/json.h>
 
-#include "afb-plugin.h"
+#include <afb/afb-plugin.h>
 
 // Dummy sample of Client Application Context
 typedef struct {
@@ -28,13 +28,20 @@ typedef struct {
 } MyClientApplicationHandle;
 
 
+// This function is call when Client Session Context is removed
+// Note: when freeCtxCB==NULL standard free/malloc is called
+static void clientContextFree(void *context) {
+    fprintf (stderr,"Plugin[token] Closing Session\n");
+    free (context);
+}
+
 // Request Creation of new context if it does not exist
 static void clientContextCreate (struct afb_req request)
 {
     json_object *jresp;
 
     // add an application specific client context to session
-    request.context = malloc (sizeof (MyClientApplicationHandle));
+    afb_req_context_set(request, malloc (sizeof (MyClientApplicationHandle)), clientContextFree);
     
     // Send response to UI
     jresp = json_object_new_object();               
@@ -92,31 +99,25 @@ static void clientGetPing (struct afb_req request) {
 }
 
 
-// This function is call when Client Session Context is removed
-// Note: when freeCtxCB==NULL standard free/malloc is called
-static void clientContextFree(void *context) {
-    fprintf (stderr,"Plugin[token] Closing Session\n");
-    free (context);
-}
-
-static const struct AFB_restapi pluginApis[]= {
-  {"ping"    , AFB_SESSION_NONE  , clientGetPing       ,"Ping Rest Test Service"},
-  {"create"  , AFB_SESSION_CREATE, clientContextCreate ,"Request Client Context Creation"},
-  {"refresh" , AFB_SESSION_RENEW , clientContextRefresh,"Refresh Client Context Token"},
-  {"check"   , AFB_SESSION_CHECK , clientContextCheck  ,"Check Client Context Token"},
-  {"reset"   , AFB_SESSION_CLOSE , clientContextReset  ,"Close Client Context and Free resources"},
+static const struct AFB_verb_desc_v1 verbs[]= {
+  {"ping"    , AFB_SESSION_NONE                        , clientGetPing       ,"Ping Rest Test Service"},
+  {"create"  , AFB_SESSION_LOA_EQ_0 | AFB_SESSION_RENEW, clientContextCreate ,"Request Client Context Creation"},
+  {"refresh" , AFB_SESSION_LOA_GE_1 | AFB_SESSION_RENEW, clientContextRefresh,"Refresh Client Context Token"},
+  {"check"   , AFB_SESSION_LOA_GE_1                    , clientContextCheck  ,"Check Client Context Token"},
+  {"reset"   , AFB_SESSION_LOA_GE_1 | AFB_SESSION_CLOSE, clientContextReset  ,"Close Client Context and Free resources"},
   {NULL}
 };
 
 static const struct AFB_plugin plugin_desc = {
-	.type = AFB_PLUGIN_JSON,
-	.info = "Application Framework Binder Service",
-	.prefix = "token",
-	.apis = pluginApis,
-	.freeCtxCB = clientContextFree
+	.type = AFB_PLUGIN_VERSION_1,
+	.v1 = {
+		.info = "Application Framework Binder Service",
+		.prefix = "token",
+		.verbs = verbs
+	}
 };
 
-const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf)
+const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
 {
 	return &plugin_desc;
 }