diff options
| author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2023-11-27 14:43:10 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander@ouroboros.rocks> | 2023-11-29 09:57:29 +0100 |
| commit | 3f24301fff9c544dfe2b89c5737bc3cdf94ef9a9 (patch) | |
| tree | 35e04e27e4a0e11c91fe3aa201004ac1d83a72e0 /src/ipcpd | |
| parent | c1d679506180bc23241fe14818c0a2dbbcbe3cef (diff) | |
| download | ouroboros-3f24301fff9c544dfe2b89c5737bc3cdf94ef9a9.tar.gz ouroboros-3f24301fff9c544dfe2b89c5737bc3cdf94ef9a9.zip | |
include: Rename layer.layer_name to layer.name
The layer_info had a member layer_name which is a bit
redundant.
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/broadcast/main.c | 4 | ||||
| -rw-r--r-- | src/ipcpd/eth/eth.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/local/main.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/udp/main.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/unicast/main.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/ipcpd/broadcast/main.c b/src/ipcpd/broadcast/main.c index de1feeb2..e3e323a8 100644 --- a/src/ipcpd/broadcast/main.c +++ b/src/ipcpd/broadcast/main.c @@ -56,7 +56,7 @@ struct ipcp ipcpi; static int initialize_components(const struct ipcp_config * conf) { - strcpy(ipcpi.layer_name, conf->layer_info.layer_name); + strcpy(ipcpi.layer_name, conf->layer_info.name); ipcpi.dir_hash_algo = conf->layer_info.dir_hash_algo; assert(ipcp_dir_hash_len() != 0); @@ -147,7 +147,7 @@ static int broadcast_ipcp_enroll(const char * dst, log_info_id(id, "Enrolled with %s.", dst); info->dir_hash_algo = ipcpi.dir_hash_algo; - strcpy(info->layer_name, ipcpi.layer_name); + strcpy(info->name, ipcpi.layer_name); return 0; diff --git a/src/ipcpd/eth/eth.c b/src/ipcpd/eth/eth.c index 999c1ac8..09c7bde9 100644 --- a/src/ipcpd/eth/eth.c +++ b/src/ipcpd/eth/eth.c @@ -1248,7 +1248,7 @@ static int eth_ipcp_bootstrap(const struct ipcp_config * conf) assert(conf->type == THIS_TYPE); ipcpi.dir_hash_algo = conf->layer_info.dir_hash_algo; - strcpy(ipcpi.layer_name, conf->layer_info.layer_name); + strcpy(ipcpi.layer_name, conf->layer_info.name); if (strlen(conf->eth.dev) >= IFNAMSIZ) { log_err("Invalid device name: %s.", conf->eth.dev); diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c index ef1c679b..58d9c866 100644 --- a/src/ipcpd/local/main.c +++ b/src/ipcpd/local/main.c @@ -145,7 +145,7 @@ static int local_ipcp_bootstrap(const struct ipcp_config * conf) assert(conf->type == THIS_TYPE); ipcpi.dir_hash_algo = conf->layer_info.dir_hash_algo; - strcpy(ipcpi.layer_name,conf->layer_info.layer_name); + strcpy(ipcpi.layer_name,conf->layer_info.name); if (pthread_create(&local_data.packet_loop, NULL, local_ipcp_packet_loop, NULL)) { diff --git a/src/ipcpd/udp/main.c b/src/ipcpd/udp/main.c index ddcf1a5b..b189dce3 100644 --- a/src/ipcpd/udp/main.c +++ b/src/ipcpd/udp/main.c @@ -595,7 +595,7 @@ static int udp_ipcp_bootstrap(const struct ipcp_config * conf) ((struct ipcp_config *) conf)->layer_info.dir_hash_algo = HASH_MD5; ipcpi.dir_hash_algo = conf->layer_info.dir_hash_algo; - strcpy(ipcpi.layer_name, conf->layer_info.layer_name); + strcpy(ipcpi.layer_name, conf->layer_info.name); if (inet4_ntop(&conf->udp.ip_addr, ipstr) == NULL) { log_err("Failed to convert IP address."); diff --git a/src/ipcpd/unicast/main.c b/src/ipcpd/unicast/main.c index 83504168..06441ae0 100644 --- a/src/ipcpd/unicast/main.c +++ b/src/ipcpd/unicast/main.c @@ -59,7 +59,7 @@ struct ipcp ipcpi; static int initialize_components(const struct ipcp_config * conf) { - strcpy(ipcpi.layer_name, conf->layer_info.layer_name); + strcpy(ipcpi.layer_name, conf->layer_info.name); ipcpi.dir_hash_algo = conf->layer_info.dir_hash_algo; assert(ipcp_dir_hash_len() != 0); @@ -228,7 +228,7 @@ static int unicast_ipcp_enroll(const char * dst, log_info_id(id, "Enrolled with %s.", dst); info->dir_hash_algo = ipcpi.dir_hash_algo; - strcpy(info->layer_name, ipcpi.layer_name); + strcpy(info->name, ipcpi.layer_name); return 0; |