summaryrefslogtreecommitdiff
path: root/src/ipcpd/unicast/main.c
diff options
context:
space:
mode:
authorDimitri Staessens <[email protected]>2021-03-26 20:47:25 +0100
committerSander Vrijders <[email protected]>2021-03-28 12:46:32 +0200
commit809e4d1957daa701a3390b0526b125cc263bfe26 (patch)
tree207564cc3fd5d3218624cfa114a92fd9b152fd37 /src/ipcpd/unicast/main.c
parent994465e34a732db3bce542ee021674473f32d572 (diff)
downloadouroboros-809e4d1957daa701a3390b0526b125cc263bfe26.tar.gz
ouroboros-809e4d1957daa701a3390b0526b125cc263bfe26.zip
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 <[email protected]> Signed-off-by: Sander Vrijders <[email protected]>
Diffstat (limited to 'src/ipcpd/unicast/main.c')
-rw-r--r--src/ipcpd/unicast/main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ipcpd/unicast/main.c b/src/ipcpd/unicast/main.c
index 050b9229..96df1664 100644
--- a/src/ipcpd/unicast/main.c
+++ b/src/ipcpd/unicast/main.c
@@ -29,6 +29,7 @@
#include "config.h"
#define OUROBOROS_PREFIX "unicast-ipcp"
+#define THIS_TYPE IPCP_UNICAST
#include <ouroboros/errno.h>
#include <ouroboros/hash.h>
@@ -38,12 +39,12 @@
#include <ouroboros/rib.h>
#include <ouroboros/time_utils.h>
+#include "common/connmgr.h"
+#include "common/enroll.h"
#include "addr_auth.h"
#include "ca.h"
-#include "connmgr.h"
#include "dir.h"
#include "dt.h"
-#include "enroll.h"
#include "fa.h"
#include "ipcp.h"
@@ -54,8 +55,6 @@
#include <assert.h>
#include <inttypes.h>
-#define THIS_TYPE IPCP_UNICAST
-
struct ipcp ipcpi;
static int initialize_components(const struct ipcp_config * conf)