From 809e4d1957daa701a3390b0526b125cc263bfe26 Mon Sep 17 00:00:00 2001
From: Dimitri Staessens <dimitri@ouroboros.rocks>
Date: Fri, 26 Mar 2021 20:47:25 +0100
Subject: build: Move connmgr and enrolment to common ground

The connection manager and enrolment components of the unicast and
broadcast IPCP have a lot in common, as conjectured in the paper. The
initial implementation of the broadcast IPCP just duplicated the
code. This moves the shared functionality to common ground.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
---
 src/ipcpd/broadcast/main.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/ipcpd/broadcast/main.c')

diff --git a/src/ipcpd/broadcast/main.c b/src/ipcpd/broadcast/main.c
index b7555803..a2643029 100644
--- a/src/ipcpd/broadcast/main.c
+++ b/src/ipcpd/broadcast/main.c
@@ -29,6 +29,7 @@
 #include "config.h"
 
 #define OUROBOROS_PREFIX "broadcast-ipcp"
+#define THIS_TYPE IPCP_BROADCAST
 
 #include <ouroboros/errno.h>
 #include <ouroboros/hash.h>
@@ -39,9 +40,9 @@
 #include <ouroboros/rib.h>
 #include <ouroboros/time_utils.h>
 
-#include "connmgr.h"
+#include "common/connmgr.h"
+#include "common/enroll.h"
 #include "dt.h"
-#include "enroll.h"
 #include "ipcp.h"
 
 #include <stdbool.h>
@@ -51,8 +52,6 @@
 #include <assert.h>
 #include <inttypes.h>
 
-#define THIS_TYPE IPCP_BROADCAST
-
 struct ipcp ipcpi;
 
 static int initialize_components(const struct ipcp_config * conf)
-- 
cgit v1.2.3