From 9903b8a2f9a7dc8ebac6928dcf2d2b5593ea0615 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Fri, 12 May 2017 13:05:47 +0200 Subject: ipcpd: Allow specifying fixed syntax This commits adds the functions and messages to specify a fixed protocol syntax during CACEP. It also revises the messages for specifying the DT protocol syntax from the irm tool. --- src/irmd/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/irmd/main.c') diff --git a/src/irmd/main.c b/src/irmd/main.c index 3331c754..b3243192 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -423,19 +423,19 @@ static int bootstrap_ipcp(pid_t api, return -1; } - entry->dif_name = strdup(conf->dif_name); + entry->dif_name = strdup(conf->dif_info->dif_name); if (entry->dif_name == NULL) { pthread_rwlock_unlock(&irmd.reg_lock); log_warn("Failed to set name of DIF."); return -ENOMEM; } - entry->dir_hash_algo = conf->dir_hash_algo; + entry->dir_hash_algo = conf->dif_info->dir_hash_algo; pthread_rwlock_unlock(&irmd.reg_lock); log_info("Bootstrapped IPCP %d in DIF %s.", - entry->api, conf->dif_name); + entry->api, conf->dif_info->dif_name); return 0; } @@ -484,7 +484,7 @@ static int enroll_ipcp(pid_t api, return -ENOMEM; } - entry->dir_hash_algo = info.algo; + entry->dir_hash_algo = info.dir_hash_algo; pthread_rwlock_unlock(&irmd.reg_lock); -- cgit v1.2.3