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/tools/irm/irm_ipcp_bootstrap.c | 24 ++++++++++++------------ src/tools/irm/irm_ipcp_create.c | 20 ++++++++++---------- src/tools/irm/irm_ipcp_enroll.c | 4 ++-- src/tools/irm/irm_register.c | 18 +++++++++--------- src/tools/irm/irm_unregister.c | 16 ++++++++-------- 5 files changed, 41 insertions(+), 41 deletions(-) (limited to 'src/tools/irm') diff --git a/src/tools/irm/irm_ipcp_bootstrap.c b/src/tools/irm/irm_ipcp_bootstrap.c index 66bb96ce..2dc6f5f6 100644 --- a/src/tools/irm/irm_ipcp_bootstrap.c +++ b/src/tools/irm/irm_ipcp_bootstrap.c @@ -50,8 +50,8 @@ #include "irm_utils.h" #define NORMAL "normal" -#define SHIM_UDP "shim-udp" -#define SHIM_ETH_LLC "shim-eth-llc" +#define UDP "udp" +#define ETH_LLC "eth-llc" #define LOCAL "local" #define RAPTOR "raptor" @@ -79,10 +79,10 @@ static void usage(void) /* FIXME: Add ipcp_config stuff */ printf("Usage: irm ipcp bootstrap\n" " name \n" - " dif \n" + " layer \n" " type [TYPE]\n" "where TYPE = {" NORMAL " " LOCAL " " - SHIM_UDP " " SHIM_ETH_LLC " " RAPTOR "},\n\n" + UDP " " ETH_LLC " " RAPTOR "},\n\n" "if TYPE == " NORMAL "\n" " [addr
(default: %d)]\n" " [fd (default: %d)]\n" @@ -98,11 +98,11 @@ static void usage(void) " PFF_POLICY = {" SIMPLE_PFF " " ALTERNATE_PFF "}\n" " ALGORITHM = {" SHA3_224 " " SHA3_256 " " SHA3_384 " " SHA3_512 "}\n\n" - "if TYPE == " SHIM_UDP "\n" + "if TYPE == " UDP "\n" " ip \n" " [dns " " (default: none)]\n\n" - "if TYPE == " SHIM_ETH_LLC "\n" + "if TYPE == " ETH_LLC "\n" " if_name \n" " [hash [ALGORITHM] (default: %s)]\n" "where ALGORITHM = {" SHA3_224 " " SHA3_256 " " @@ -148,7 +148,7 @@ int do_bootstrap_ipcp(int argc, cargs = 2; if (matches(*argv, "type") == 0) { ipcp_type = *(argv + 1); - } else if (matches(*argv, "dif") == 0) { + } else if (matches(*argv, "layer") == 0) { dif_name = *(argv + 1); } else if (matches(*argv, "name") == 0) { name = *(argv + 1); @@ -216,7 +216,7 @@ int do_bootstrap_ipcp(int argc, } strcpy(conf.dif_info.dif_name, dif_name); - if (strcmp(ipcp_type, SHIM_UDP) != 0) + if (strcmp(ipcp_type, UDP) != 0) conf.dif_info.dir_hash_algo = hash_algo; if (strcmp(ipcp_type, NORMAL) == 0) { @@ -227,8 +227,8 @@ int do_bootstrap_ipcp(int argc, conf.addr_auth_type = addr_auth_type; conf.routing_type = routing_type; conf.pff_type = pff_type; - } else if (strcmp(ipcp_type, SHIM_UDP) == 0) { - conf.type = IPCP_SHIM_UDP; + } else if (strcmp(ipcp_type, UDP) == 0) { + conf.type = IPCP_UDP; if (ip_addr == 0) { usage(); return -1; @@ -239,8 +239,8 @@ int do_bootstrap_ipcp(int argc, conf.type = IPCP_LOCAL; } else if (strcmp(ipcp_type, RAPTOR) == 0) { conf.type = IPCP_RAPTOR; - } else if (strcmp(ipcp_type, SHIM_ETH_LLC) == 0) { - conf.type = IPCP_SHIM_ETH_LLC; + } else if (strcmp(ipcp_type, ETH_LLC) == 0) { + conf.type = IPCP_ETH_LLC; if (if_name == NULL) { usage(); return -1; diff --git a/src/tools/irm/irm_ipcp_create.c b/src/tools/irm/irm_ipcp_create.c index 1ec73049..fa453fee 100644 --- a/src/tools/irm/irm_ipcp_create.c +++ b/src/tools/irm/irm_ipcp_create.c @@ -44,11 +44,11 @@ #include "irm_ops.h" #include "irm_utils.h" -#define NORMAL "normal" -#define SHIM_UDP "shim-udp" -#define SHIM_ETH_LLC "shim-eth-llc" -#define LOCAL "local" -#define RAPTOR "raptor" +#define NORMAL "normal" +#define UDP "udp" +#define ETH_LLC "eth-llc" +#define LOCAL "local" +#define RAPTOR "raptor" static void usage(void) { @@ -56,7 +56,7 @@ static void usage(void) " name \n" " type [TYPE]\n\n" "where TYPE = {" NORMAL " " LOCAL " " - SHIM_UDP " " SHIM_ETH_LLC " " RAPTOR "}\n"); + UDP " " ETH_LLC " " RAPTOR "}\n"); } int do_create_ipcp(int argc, char ** argv) @@ -88,12 +88,12 @@ int do_create_ipcp(int argc, char ** argv) if (strcmp(ipcp_type, NORMAL) == 0) type = IPCP_NORMAL; - else if (strcmp(ipcp_type, SHIM_UDP) == 0) - type = IPCP_SHIM_UDP; + else if (strcmp(ipcp_type, UDP) == 0) + type = IPCP_UDP; else if (strcmp(ipcp_type, LOCAL) == 0) type = IPCP_LOCAL; - else if (strcmp(ipcp_type, SHIM_ETH_LLC) == 0) - type = IPCP_SHIM_ETH_LLC; + else if (strcmp(ipcp_type, ETH_LLC) == 0) + type = IPCP_ETH_LLC; else if (strcmp(ipcp_type, RAPTOR) == 0) type = IPCP_RAPTOR; else { diff --git a/src/tools/irm/irm_ipcp_enroll.c b/src/tools/irm/irm_ipcp_enroll.c index 4beb6754..dc40567f 100644 --- a/src/tools/irm/irm_ipcp_enroll.c +++ b/src/tools/irm/irm_ipcp_enroll.c @@ -48,7 +48,7 @@ static void usage(void) { printf("Usage: irm ipcp enroll\n" " name \n" - " dif \n" + " layer \n" " [autobind]\n"); } @@ -67,7 +67,7 @@ int do_enroll_ipcp(int argc, char ** argv) cargs = 2; if (matches(*argv, "name") == 0) { name = *(argv + 1); - } else if (matches(*argv, "dif") == 0) { + } else if (matches(*argv, "layer") == 0) { dif_name = *(argv + 1); } else if (matches(*argv, "autobind") == 0) { autobind = true; diff --git a/src/tools/irm/irm_register.c b/src/tools/irm/irm_register.c index 0a0fa5c0..34fd760a 100644 --- a/src/tools/irm/irm_register.c +++ b/src/tools/irm/irm_register.c @@ -43,32 +43,32 @@ #include "irm_ops.h" #include "irm_utils.h" -#define MAX_DIFS 128 +#define MAX_LAYERS 128 static void usage(void) { printf("Usage: irm register\n" " name \n" - " dif \n" - " [dif ]\n" - " [... (maximum %d difs)]\n" - , MAX_DIFS); + " layer \n" + " [layer ]\n" + " [... (maximum %d layers)]\n" + , MAX_LAYERS); } int do_register(int argc, char ** argv) { char * name = NULL; - char * difs[MAX_DIFS]; + char * difs[MAX_LAYERS]; size_t difs_len = 0; while (argc > 0) { if (matches(*argv, "name") == 0) { name = *(argv + 1); - } else if (matches(*argv, "dif") == 0) { + } else if (matches(*argv, "layer") == 0) { difs[difs_len++] = *(argv + 1); - if (difs_len > MAX_DIFS) { - printf("Too many difs specified\n"); + if (difs_len > MAX_LAYERS) { + printf("Too many layers specified\n"); return -1; } } else { diff --git a/src/tools/irm/irm_unregister.c b/src/tools/irm/irm_unregister.c index 09b7ec21..64053706 100644 --- a/src/tools/irm/irm_unregister.c +++ b/src/tools/irm/irm_unregister.c @@ -44,30 +44,30 @@ #include "irm_ops.h" #include "irm_utils.h" -#define MAX_DIFS 128 +#define MAX_LAYERS 128 static void usage(void) { printf("Usage: irm unregister\n" " name \n" - " dif \n" - " [dif ]\n" - " [... (maximum %d difs)]\n" - , MAX_DIFS); + " layer \n" + " [layer ]\n" + " [... (maximum %d layers)]\n" + , MAX_LAYERS); } int do_unregister(int argc, char ** argv) { - char * difs[MAX_DIFS]; + char * difs[MAX_LAYERS]; size_t difs_len = 0; char * name = NULL; while (argc > 0) { if (matches(*argv, "name") == 0) { name = *(argv + 1); - } else if (matches(*argv, "dif") == 0) { + } else if (matches(*argv, "layer") == 0) { difs[difs_len++] = *(argv + 1); - if (difs_len > MAX_DIFS) { + if (difs_len > MAX_LAYERS) { printf("Too many difs specified\n"); return -1; } -- cgit v1.2.3