X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=bindings%2Ftutorial%2Ftuto-3.cpp;h=8ad69ef39dc1457de16d24caf2bdd3075493a04a;hb=3abc75dfa35fa36c0f5f55cd4aed4d443620b3a9;hp=7400b9869148a1e117301a34a52a083b4b651440;hpb=70fe993324e901254c3e42225f9e5f5d111b1b14;p=src%2Fapp-framework-binder.git

diff --git a/bindings/tutorial/tuto-3.cpp b/bindings/tutorial/tuto-3.cpp
index 7400b986..8ad69ef3 100644
--- a/bindings/tutorial/tuto-3.cpp
+++ b/bindings/tutorial/tuto-3.cpp
@@ -1,15 +1,15 @@
 #include <string.h>
 #include <json-c/json.h>
 
+#define AFB_BINDING_VERSION 3
 #include <afb/afb-binding>
 
 afb::event event_login, event_logout;
 
-void login(afb_req r)
+void login(afb::req req)
 {
 	json_object *args, *user, *passwd;
 	char *usr;
-	afb::req req(r);
 
 	args = req.json();
 	if (!json_object_object_get_ex(args, "user", &user)
@@ -26,20 +26,20 @@ void login(afb_req r)
 		usr = strdup(json_object_get_string(user));
 		AFB_REQ_NOTICE(req, "login user: %s", usr);
 		req.session_set_LOA(1);
-		req.context_set(usr, free);
+//		req.context(1, nullptr, free, usr);
 		req.success();
 		event_login.push(json_object_new_string(usr));
 	}
 }
 
-void action(afb_req r)
+void action(afb::req req)
 {
 	json_object *args, *val;
 	char *usr;
-	afb::req req(r);
 
 	args = req.json();
-	usr = (char*)req.context_get();
+//	usr = (char*)req.context_get();
+usr = nullptr;
 	AFB_REQ_NOTICE(req, "action for user %s: %s", usr, json_object_get_string(args));
 	if (json_object_object_get_ex(args, "subscribe", &val)) {
 		if (json_object_get_boolean(val)) {
@@ -55,20 +55,24 @@ void action(afb_req r)
 	req.success(json_object_get(args));
 }
 
-void logout(afb_req r)
+void logout(afb::req req)
 {
 	char *usr;
-	afb::req req(r);
 
-	usr = (char*)req.context_get();
+//	usr = (char*)req.context_get();
+usr = nullptr;
 	AFB_REQ_NOTICE(req, "login user %s out", usr);
 	event_logout.push(json_object_new_string(usr));
 	req.session_set_LOA(0);
-	req.context_clear();
+//	req.context_clear();
 	req.success();
 }
 
-int init()
+int init(
+#if AFB_BINDING_VERSION >= 3
+	afb_api_t api
+#endif
+)
 {
 	AFB_NOTICE("init");
 	event_login = afb_daemon_make_event("login");
@@ -79,12 +83,13 @@ int init()
 	return -1;
 }
 
-const afb_verb_v2 verbs[] = {
+const afb_verb_t verbs[] = {
 	afb::verb("login", login, "log in the system"),
 	afb::verb("action", action, "perform an action", AFB_SESSION_LOA_1),
 	afb::verb("logout", logout, "log out the system", AFB_SESSION_LOA_1),
 	afb::verbend()
 };
 
-const afb_binding_v2 afbBindingV2 = afb::binding("tuto-3", verbs, "third tutorial: C++", init);
+const afb_binding_t afbBindingExport = afb::binding("tuto-3", verbs, "third tutorial: C++", init);
+