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>

4 files changed, 10 insertions, 10 deletions

diff --git a/src/irmd/config.h.in b/src/irmd/config.h.in
index 83e59375..e6821256 100644
--- a/src/irmd/config.h.in
+++ b/src/irmd/config.h.in
@@ -20,8 +20,8 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
-#define IPCP_SHIM_UDP_EXEC      "@IPCP_SHIM_UDP_TARGET@"
-#define IPCP_SHIM_ETH_LLC_EXEC  "@IPCP_SHIM_ETH_LLC_TARGET@"
+#define IPCP_UDP_EXEC           "@IPCP_UDP_TARGET@"
+#define IPCP_ETH_LLC_EXEC       "@IPCP_ETH_LLC_TARGET@"
 #define IPCP_NORMAL_EXEC        "@IPCP_NORMAL_TARGET@"
 #define IPCP_LOCAL_EXEC         "@IPCP_LOCAL_TARGET@"
 #define IPCP_RAPTOR_EXEC        "@IPCP_RAPTOR_TARGET@"
diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c
index dfb7c96b..60bf3512 100644
--- a/src/irmd/ipcp.c
+++ b/src/irmd/ipcp.c
@@ -139,11 +139,11 @@ pid_t ipcp_create(const char *   name,
         case IPCP_NORMAL:
                 exec_name = IPCP_NORMAL_EXEC;
                 break;
-        case IPCP_SHIM_UDP:
-                exec_name = IPCP_SHIM_UDP_EXEC;
+        case IPCP_UDP:
+                exec_name = IPCP_UDP_EXEC;
                 break;
-        case IPCP_SHIM_ETH_LLC:
-                exec_name = IPCP_SHIM_ETH_LLC_EXEC;
+        case IPCP_ETH_LLC:
+                exec_name = IPCP_ETH_LLC_EXEC;
                 break;
         case IPCP_LOCAL:
                 exec_name = IPCP_LOCAL_EXEC;
diff --git a/src/irmd/main.c b/src/irmd/main.c
index 7b4ad9d8..eb10cc4f 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -502,7 +502,7 @@ static int bootstrap_ipcp(pid_t               pid,
         entry->dif_name = strdup(info.dif_name);
         if (entry->dif_name == NULL) {
                 pthread_rwlock_unlock(&irmd.reg_lock);
-                log_warn("Failed to set name of DIF.");
+                log_warn("Failed to set name of layer.");
                 return -ENOMEM;
         }
 
@@ -510,7 +510,7 @@ static int bootstrap_ipcp(pid_t               pid,
 
         pthread_rwlock_unlock(&irmd.reg_lock);
 
-        log_info("Bootstrapped IPCP %d in DIF %s.",
+        log_info("Bootstrapped IPCP %d in layer %s.",
                  pid, conf->dif_info->dif_name);
 
         return 0;
@@ -564,7 +564,7 @@ static int enroll_ipcp(pid_t  pid,
 
         pthread_rwlock_unlock(&irmd.reg_lock);
 
-        log_info("Enrolled IPCP %d in DIF %s.",
+        log_info("Enrolled IPCP %d in layer %s.",
                  pid, info.dif_name);
 
         return 0;
diff --git a/src/irmd/registry.h b/src/irmd/registry.h
index f1f52b9e..6757b0ad 100644
--- a/src/irmd/registry.h
+++ b/src/irmd/registry.h
@@ -55,7 +55,7 @@ struct reg_entry {
         struct list_head    next;
         char *              name;
 
-        /* DIFs in which this name is registered */
+        /* layers in which this name is registered */
         struct list_head    difs;
         /* Programs that can be instantiated by the irmd */
         struct list_head    reg_progs;