summaryrefslogtreecommitdiff
path: root/src/irmd
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2019-07-25 12:50:46 +0200
committerSander Vrijders <sander@ouroboros.rocks>2019-07-29 19:36:45 +0200
commitdae15c284248d49079ad5f8a3d8ff30e217f419e (patch)
treeea7942e940396c0c78304fef8b43fb25c5aebba8 /src/irmd
parentc9232acef855b51d1bc199a68c03c0695ac11192 (diff)
downloadouroboros-dae15c284248d49079ad5f8a3d8ff30e217f419e.tar.gz
ouroboros-dae15c284248d49079ad5f8a3d8ff30e217f419e.zip
build: Refactor normal to unicast
This completes the renaming of the normal IPCP to the unicast IPCP in the sources, to get everything consistent with the documentation. Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/irmd')
-rw-r--r--src/irmd/config.h.in2
-rw-r--r--src/irmd/ipcp.c4
-rw-r--r--src/irmd/main.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/irmd/config.h.in b/src/irmd/config.h.in
index 10cfb8fc..8c5aee86 100644
--- a/src/irmd/config.h.in
+++ b/src/irmd/config.h.in
@@ -23,7 +23,7 @@
#define IPCP_UDP_EXEC "@IPCP_UDP_TARGET@"
#define IPCP_ETH_LLC_EXEC "@IPCP_ETH_LLC_TARGET@"
#define IPCP_ETH_DIX_EXEC "@IPCP_ETH_DIX_TARGET@"
-#define IPCP_NORMAL_EXEC "@IPCP_NORMAL_TARGET@"
+#define IPCP_UNICAST_EXEC "@IPCP_UNICAST_TARGET@"
#define IPCP_BROADCAST_EXEC "@IPCP_BROADCAST_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 f6aaaf59..c566a57c 100644
--- a/src/irmd/ipcp.c
+++ b/src/irmd/ipcp.c
@@ -137,8 +137,8 @@ pid_t ipcp_create(const char * name,
char * argv[5];
switch(ipcp_type) {
- case IPCP_NORMAL:
- exec_name = IPCP_NORMAL_EXEC;
+ case IPCP_UNICAST:
+ exec_name = IPCP_UNICAST_EXEC;
break;
case IPCP_BROADCAST:
exec_name = IPCP_BROADCAST_EXEC;
diff --git a/src/irmd/main.c b/src/irmd/main.c
index 22a32124..5875d7dc 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -630,7 +630,7 @@ static int connect_ipcp(pid_t pid,
return -EIPCP;
}
- if (entry->type != IPCP_NORMAL && entry->type != IPCP_BROADCAST) {
+ if (entry->type != IPCP_UNICAST && entry->type != IPCP_BROADCAST) {
pthread_rwlock_unlock(&irmd.reg_lock);
log_err("Cannot establish connections for this IPCP type.");
return -EIPCP;
@@ -666,7 +666,7 @@ static int disconnect_ipcp(pid_t pid,
return -EIPCP;
}
- if (entry->type != IPCP_NORMAL) {
+ if (entry->type != IPCP_UNICAST) {
pthread_rwlock_unlock(&irmd.reg_lock);
log_err("Cannot tear down connections for this IPCP type.");
return -EIPCP;