summaryrefslogtreecommitdiff
path: root/src/ipcpd/ipcp.c
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-07-12 14:30:27 +0000
committerdimitri staessens <dimitri.staessens@ugent.be>2017-07-12 14:30:27 +0000
commit0bcb3ab0804bbfd31d056c08548cb40591598f4b (patch)
treed1da4fcf7cc2875b077d767775359ad92dc10d7c /src/ipcpd/ipcp.c
parent3e9ee89b3ccf48dcabf7de2ecafcfbf637595cfe (diff)
parentd088c3395a28bce3e1530db5aeacbcf59ab16619 (diff)
downloadouroboros-0bcb3ab0804bbfd31d056c08548cb40591598f4b.tar.gz
ouroboros-0bcb3ab0804bbfd31d056c08548cb40591598f4b.zip
Merged in sandervrijders/ouroboros/be-hash (pull request #528)
ipcpd, lib, irmd: Hardcode shim hash algorithms Approved-by: dimitri staessens <dimitri.staessens@ugent.be>
Diffstat (limited to 'src/ipcpd/ipcp.c')
-rw-r--r--src/ipcpd/ipcp.c6
1 files changed, 4 insertions, 2 deletions
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: