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 <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>

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;
 };