summaryrefslogtreecommitdiff
path: root/src/irmd
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri.staessens@ugent.be>2017-12-13 17:54:13 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2017-12-15 15:43:37 +0100
commit757cbecfeb13e0db0fd8db7b2a3e8c57f733e77d (patch)
tree34ebed962b22fe4721c3bb5f7175d9f2c3dd90ee /src/irmd
parent7f077e978738c3ecdb37b3d5cf30e03bb63fc8ad (diff)
downloadouroboros-757cbecfeb13e0db0fd8db7b2a3e8c57f733e77d.tar.gz
ouroboros-757cbecfeb13e0db0fd8db7b2a3e8c57f733e77d.zip
ipcpd: Integrate raptor into ouroboros 0.8
The raptor code is refactored to completely remove reduntant code relating to addresses. The dependency on the google protocol buffers is removed. The build system will only build raptor if the relevant kernel module is found on the system. The irm tool and the relevant documentation are updated. Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be> Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
Diffstat (limited to 'src/irmd')
-rw-r--r--src/irmd/config.h.in1
-rw-r--r--src/irmd/ipcp.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/irmd/config.h.in b/src/irmd/config.h.in
index 5a5462c5..83e59375 100644
--- a/src/irmd/config.h.in
+++ b/src/irmd/config.h.in
@@ -24,6 +24,7 @@
#define IPCP_SHIM_ETH_LLC_EXEC "@IPCP_SHIM_ETH_LLC_TARGET@"
#define IPCP_NORMAL_EXEC "@IPCP_NORMAL_TARGET@"
#define IPCP_LOCAL_EXEC "@IPCP_LOCAL_TARGET@"
+#define IPCP_RAPTOR_EXEC "@IPCP_RAPTOR_TARGET@"
#define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c
index d2eaa947..dfb7c96b 100644
--- a/src/irmd/ipcp.c
+++ b/src/irmd/ipcp.c
@@ -148,6 +148,9 @@ pid_t ipcp_create(const char * name,
case IPCP_LOCAL:
exec_name = IPCP_LOCAL_EXEC;
break;
+ case IPCP_RAPTOR:
+ exec_name = IPCP_RAPTOR_EXEC;
+ break;
default:
return -1;
}