register PEP callback on access_init

iotaledger · Jun 18, 2020 · f034054 · f034054
1 parent 65b075e
commit f034054
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/access/access.c b/access/access.c
@@ -58,7 +58,7 @@ typedef struct {
   dataset_state_t ddstate;
 } access_ctx_t_;
 
-void access_init(access_ctx_t *access_context, wallet_ctx_t *device_wallet) {
+void access_init(access_ctx_t *access_context, wallet_ctx_t *device_wallet, resolver_plugin_initializer_t resolver_init_fn) {
   if (device_wallet == NULL) {
     access_context = NULL;
     return;
@@ -78,8 +78,9 @@ void access_init(access_ctx_t *access_context, wallet_ctx_t *device_wallet) {
 
   ctx->json_mutex = datadumper_get_mutex();
 
+  pep_register_callback(resolver_init(resolver_init_fn, &ctx->ddstate, (void*)device_wallet));
+
   if (strncmp(ctx->client_name, CONFIG_CLIENT_CAN01, strlen(CONFIG_CLIENT_CAN01)) == 0) {
-    resolver_init(demowalletplugin_initializer, &ctx->ddstate, (void *)device_wallet);
 #ifdef TINY_EMBEDDED
     ctx->ddstate.options = &VehicleDatasetDemo01_options[0];
     ctx->ddstate.dataset = malloc(sizeof(can01_vehicle_dataset_t));

diff --git a/access/access.h b/access/access.h
@@ -22,11 +22,11 @@
 
 #include "dataset.h"
 #include "wallet.h"
+#include "demo_resolver_wallet.h"
 
 typedef void *access_ctx_t;
 
-void access_init(access_ctx_t *access_context, wallet_ctx_t *device_wallet);
-
+void access_init(access_ctx_t *access_context, wallet_ctx_t *device_wallet, resolver_plugin_initializer_t resolver_init_fn);
 void access_start(access_ctx_t access_context);
 
 void access_deinit(access_ctx_t access_context);

diff --git a/main.c b/main.c
@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
 
   device_wallet = wallet_create(NODE_URL, NODE_PORT, NULL, NODE_DEPTH, NODE_MWM, WALLET_SEED);
 
-  access_init(&access_context, device_wallet);
+  access_init(&access_context, device_wallet, demowalletplugin_initializer);
   access_get_ddstate(access_context, &ddstate);
 
   network_init(ddstate, &network_context);

diff --git a/plugins/resolver/resolver.c b/plugins/resolver/resolver.c
@@ -40,7 +40,6 @@
 #include <string.h>
 #include "datadumper.h"
 #include "dlog.h"
-#include "pep.h"
 #include "time_manager.h"
 #include "timer.h"
 
@@ -144,7 +143,7 @@ static int action_resolve(resolver_action_data_t *action, int should_log) {
   return retval;
 }
 
-static bool pep_request(char *obligation, void *action) {
+static bool resolver_callback(char *obligation, void *action) {
   bool should_log = FALSE;
   resolver_action_data_t *action_r;
 
@@ -172,11 +171,11 @@ static bool pep_request(char *obligation, void *action) {
 /****************************************************************************
  * API FUNCTIONS
  ****************************************************************************/
-void resolver_init(resolver_plugin_initializer_t initializer, dataset_state_t *dstate, void *options) {
+resolver_fn resolver_init(resolver_plugin_initializer_t initializer, dataset_state_t *dstate, void *options) {
   initializer(&resolver_action_set, options);
   g_dstate = dstate;
 
-  pep_register_callback((resolver_fn)pep_request);
+  return resolver_callback;
 }
 
 void resolver_term(resolver_plugin_terminizer_t terminizer) {

diff --git a/plugins/resolver/resolver.h b/plugins/resolver/resolver.h
@@ -41,6 +41,7 @@
 #include <stdlib.h>
 #include "dataset.h"
 #include "wallet.h"
+#include "pep.h"
 
 /****************************************************************************
  * MACROS
@@ -88,7 +89,7 @@ typedef void (*resolver_plugin_terminizer_t)(resolver_plugin_t*);
  * @brief   Initialize Resolver module
  *
  */
-void resolver_init(resolver_plugin_initializer_t initializer, dataset_state_t* dstate, void* options);
+resolver_fn resolver_init(resolver_plugin_initializer_t initializer, dataset_state_t* dstate, void* options);
 
 /**
  * @fn  void resolver_term(resolver_plugin_terminizer_t terminizer)