diff options
| author | Dimitri Staessens <dimitri.staessens@ugent.be> | 2017-12-18 20:50:04 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-12-19 10:27:02 +0100 |
| commit | e5cc7fbcf165ef9c205b6c136f239f645a8d7830 (patch) | |
| tree | 334120a6cc6dcbe240076b3957233da337bf7ad2 /src/lib | |
| parent | d654c997f142b22e2529dc0fb9fab4f799f7ef56 (diff) | |
| download | ouroboros-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 'src/lib')
| -rw-r--r-- | src/lib/ipcp_config.proto | 4 | ||||
| -rw-r--r-- | src/lib/irm.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ipcp_config.proto b/src/lib/ipcp_config.proto index aa2803f3..1ee1edcc 100644 --- a/src/lib/ipcp_config.proto +++ b/src/lib/ipcp_config.proto @@ -37,9 +37,9 @@ message ipcp_config_msg { optional uint32 addr_auth_type = 6; optional uint32 routing_type = 7; optional uint32 pff_type = 8; - // Config for shim UDP + // Config for UDP optional uint32 ip_addr = 9; optional uint32 dns_addr = 10; - // Config for the shim Ethernet LLC + // Config for the Ethernet LLC optional string if_name = 11; } diff --git a/src/lib/irm.c b/src/lib/irm.c index fa0db727..c7a19707 100644 --- a/src/lib/irm.c +++ b/src/lib/irm.c @@ -130,7 +130,7 @@ int irm_bootstrap_ipcp(pid_t pid, config.pff_type = conf->pff_type; dif_info.dir_hash_algo = conf->dif_info.dir_hash_algo; break; - case IPCP_SHIM_UDP: + case IPCP_UDP: config.has_ip_addr = true; config.ip_addr = conf->ip_addr; config.has_dns_addr = true; @@ -139,7 +139,7 @@ int irm_bootstrap_ipcp(pid_t pid, case IPCP_LOCAL: case IPCP_RAPTOR: break; - case IPCP_SHIM_ETH_LLC: + case IPCP_ETH_LLC: config.if_name = conf->if_name; break; default: |