From e5cc7fbcf165ef9c205b6c136f239f645a8d7830 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Mon, 18 Dec 2017 20:50:04 +0100 Subject: ipcpd: Use the term "layer" and deprecate "shim" This changes the terminology to use layer instead of DIF and deprecate the word "shim" for the IPCPs that attach to Ethernet LLC and UDP .The terminology has not yet been changed in the variable names etc. This reflects the design choices in Ouroboros to make IPCPs pure resource allocators instead of also providing an "IPC service". The Ouroboros IPCPs that attach to Ethernet and UDP implement the allocator and are thus not really shims. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/ipcpd/ipcp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ipcpd/ipcp.c') diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index 84c42b98..c6e819bb 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -245,10 +245,10 @@ static void * mainloop(void * o) conf.pff_type = conf_msg->pff_type; } - if (conf_msg->ipcp_type == IPCP_SHIM_ETH_LLC) + if (conf_msg->ipcp_type == IPCP_ETH_LLC) conf.if_name = conf_msg->if_name; - if (conf_msg->ipcp_type == IPCP_SHIM_UDP) { + if (conf_msg->ipcp_type == IPCP_UDP) { conf.ip_addr = conf_msg->ip_addr; conf.dns_addr = conf_msg->dns_addr; @@ -256,8 +256,8 @@ static void * mainloop(void * o) dif_info.dir_hash_algo = HASH_MD5; } - /* Only shim-udp needs a fixed hash algorithm */ - if (conf_msg->ipcp_type != IPCP_SHIM_UDP) { + /* Only udp needs a fixed hash algorithm */ + if (conf_msg->ipcp_type != IPCP_UDP) { switch(conf_msg->dif_info->dir_hash_algo) { case DIR_HASH_SHA3_224: conf.dif_info.dir_hash_algo = -- cgit v1.2.3