X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsession%2Ftoken-api.c;h=bd76ceef26662a1c60457d9317cd640022a7de74;hb=46d9538587a3521caa1e3b20bf337a53ed400777;hp=04945a8099fd0dd0a9e7dc625049bb4cdea6fa05;hpb=11d36a9f7e16aa9992835f8ce06f0e1e5297b131;p=src%2Fapp-framework-binder.git
diff --git a/plugins/session/token-api.c b/plugins/session/token-api.c
index 04945a80..bd76ceef 100644
--- a/plugins/session/token-api.c
+++ b/plugins/session/token-api.c
@@ -2,18 +2,17 @@
* Copyright (C) 2015 "IoT.bzh"
* Author "Fulup Ar Foll"
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * 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
@@ -21,7 +20,6 @@
#include
#include "afb-plugin.h"
-#include "afb-req-itf.h"
// Dummy sample of Client Application Context
typedef struct {
@@ -30,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();
@@ -94,13 +99,6 @@ 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"},
@@ -114,8 +112,7 @@ static const struct AFB_plugin plugin_desc = {
.type = AFB_PLUGIN_JSON,
.info = "Application Framework Binder Service",
.prefix = "token",
- .apis = pluginApis,
- .freeCtxCB = clientContextFree
+ .apis = pluginApis
};
const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf)