summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2018-10-12 17:44:36 +0200
committerSander Vrijders <sander.vrijders@ugent.be>2018-10-12 17:44:36 +0200
commit36b89517affd96c9e323af9a4e6e88c8f0938caf (patch)
tree4a1f9ffc324c37bef728e1610a2fb91e78ae6122 /src/lib
parent1ee129f4479b1910afc929f24bb70b8bc6478f01 (diff)
parent3a650d07d2d7540ebee65cef58b35f0373ad14d6 (diff)
downloadouroboros-36b89517affd96c9e323af9a4e6e88c8f0938caf.tar.gz
ouroboros-36b89517affd96c9e323af9a4e6e88c8f0938caf.zip
Merge branch 'testing' into be
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/irm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/irm.c b/src/lib/irm.c
index d88475c4..384da7b0 100644
--- a/src/lib/irm.c
+++ b/src/lib/irm.c
@@ -117,6 +117,9 @@ int irm_bootstrap_ipcp(pid_t pid,
config.ipcp_type = conf->type;
+ if (conf->type != IPCP_UDP)
+ layer_info.dir_hash_algo = conf->layer_info.dir_hash_algo;
+
switch (conf->type) {
case IPCP_NORMAL:
config.has_addr_size = true;
@@ -131,7 +134,6 @@ int irm_bootstrap_ipcp(pid_t pid,
config.routing_type = conf->routing_type;
config.has_pff_type = true;
config.pff_type = conf->pff_type;
- layer_info.dir_hash_algo = conf->layer_info.dir_hash_algo;
break;
case IPCP_UDP:
config.has_ip_addr = true;