summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri.staessens@ugent.be>2017-12-18 20:50:04 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2017-12-19 10:27:02 +0100
commite5cc7fbcf165ef9c205b6c136f239f645a8d7830 (patch)
tree334120a6cc6dcbe240076b3957233da337bf7ad2 /include
parentd654c997f142b22e2529dc0fb9fab4f799f7ef56 (diff)
downloadouroboros-e5cc7fbcf165ef9c205b6c136f239f645a8d7830.tar.gz
ouroboros-e5cc7fbcf165ef9c205b6c136f239f645a8d7830.zip
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 <dimitri.staessens@ugent.be> Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/ipcp.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index 2be654ea..210c38cf 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <stdbool.h>
-#define DIF_NAME_SIZE 256
+#define LAYER_NAME_SIZE 256
/*
* NOTE: the IRMd uses this order to select an IPCP
@@ -37,8 +37,8 @@ enum ipcp_type {
IPCP_LOCAL = 0,
IPCP_NORMAL,
IPCP_RAPTOR,
- IPCP_SHIM_ETH_LLC,
- IPCP_SHIM_UDP
+ IPCP_ETH_LLC,
+ IPCP_UDP
};
/* Normal IPCP policies */
@@ -63,9 +63,9 @@ enum pol_dir_hash {
DIR_HASH_SHA3_512
};
-/* Info reported back to the IRMd about the DIF on enrollment */
+/* Info reported back to the IRMd about the layer on enrollment */
struct dif_info {
- char dif_name[DIF_NAME_SIZE];
+ char dif_name[LAYER_NAME_SIZE];
int dir_hash_algo;
};
@@ -84,11 +84,11 @@ struct ipcp_config {
enum pol_routing routing_type;
enum pol_pff pff_type;
- /* Shim UDP */
+ /* UDP */
uint32_t ip_addr;
uint32_t dns_addr;
- /* Shim Ethernet LLC */
+ /* Ethernet LLC */
char * if_name;
};