From d088c3395a28bce3e1530db5aeacbcf59ab16619 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Wed, 12 Jul 2017 15:18:15 +0200 Subject: ipcpd, lib, irmd: Hardcode shim hash algorithms This will hardcode the shim hash algorithms as they don't have an enrollment phase. Fixes #44 --- src/ipcpd/ipcp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/ipcpd/ipcp.c') diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index e86487af..4aec7567 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -212,8 +212,6 @@ static void * ipcp_main_loop(void * o) conf_msg = msg->conf; conf.type = conf_msg->ipcp_type; - conf.dif_info.dir_hash_algo = - conf_msg->dif_info->dir_hash_algo; strcpy(conf.dif_info.dif_name, conf_msg->dif_info->dif_name); if (conf.dif_info.dif_name == NULL) { @@ -229,6 +227,8 @@ static void * ipcp_main_loop(void * o) conf.dt_gam_type = conf_msg->dt_gam_type; conf.rm_gam_type = conf_msg->rm_gam_type; conf.routing_type = conf_msg->routing_type; + conf.dif_info.dir_hash_algo = + conf_msg->dif_info->dir_hash_algo; } if (conf_msg->ipcp_type == IPCP_SHIM_UDP) { @@ -239,6 +239,8 @@ static void * ipcp_main_loop(void * o) if (conf_msg->ipcp_type == IPCP_SHIM_ETH_LLC) conf.if_name = conf_msg->if_name; + ipcpi.dir_hash_algo = conf_msg->dif_info->dir_hash_algo; + ret_msg.result = ipcpi.ops->ipcp_bootstrap(&conf); break; case IPCP_MSG_CODE__IPCP_ENROLL: -- cgit v1.2.3