summaryrefslogtreecommitdiff
path: root/src/ipcpd/normal/connmgr.h
diff options
context:
space:
mode:
authordimitri staessens <[email protected]>2017-08-25 17:19:17 +0200
committerdimitri staessens <[email protected]>2017-08-28 15:24:16 +0200
commit176698e8c2fd7ab8007b8074515d6144e7177d8e (patch)
tree6fa097b57aaafe3143b1f17e528479aa0624a005 /src/ipcpd/normal/connmgr.h
parenta4bff697871c8cc7252d029d77b180e41e821f7e (diff)
downloadouroboros-176698e8c2fd7ab8007b8074515d6144e7177d8e.tar.gz
ouroboros-176698e8c2fd7ab8007b8074515d6144e7177d8e.zip
ipcpd: Deprecate gam as autonomous component
The graph adjacency manager has been deprecated in favor of providing an external interface into the connectivity manager so that adjacencies can be controlled from the command line, user scripts or user applications. The gam and its associated policies were removed from the normal IPCP and the IRM configuration tools. The "/members" part of the RIB was deprecated. Removal of the gam means that initial connectivity based on changes in the RIB can't be provided, so some changes were required throughout the normal IPCP. The enrollment procedure was revised to establish its own connectivity. First, it gets boot information from a peer by establishing a connection to the remote enrollment component and downloading the IPCP configuratoin. This is now done using its own protocol buffers message in anticipation of deprecation of the RIB and CDAP for communication within a DIF. After the boot information is downloaded, it establishes a data transfer flow for enrolling the directory (DHT). After the DHT has enrolled, it signals the peer to that enrollment is done, and the data transfer connection is torn down. Signaling connections is done via the nbs struct, which is now passed to the connmgr, which enables control of the connectivity graph from external sources.
Diffstat (limited to 'src/ipcpd/normal/connmgr.h')
-rw-r--r--src/ipcpd/normal/connmgr.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ipcpd/normal/connmgr.h b/src/ipcpd/normal/connmgr.h
index 40d74348..920058da 100644
--- a/src/ipcpd/normal/connmgr.h
+++ b/src/ipcpd/normal/connmgr.h
@@ -26,13 +26,8 @@
#include <ouroboros/cacep.h>
#include <ouroboros/qos.h>
-struct conn {
- struct conn_info conn_info;
- struct flow_info {
- int fd;
- qosspec_t qs;
- } flow_info;
-};
+#include "ae.h"
+#include "neighbors.h"
int connmgr_init(void);
@@ -42,16 +37,21 @@ int connmgr_start(void);
void connmgr_stop(void);
-struct ae * connmgr_ae_create(struct conn_info info);
+int connmgr_ae_init(enum ae_id id,
+ const struct conn_info * info,
+ struct nbs * nbs);
-void connmgr_ae_destroy(struct ae * ae);
+void connmgr_ae_fini(enum ae_id id);
-int connmgr_alloc(struct ae * ae,
+int connmgr_alloc(enum ae_id id,
const char * dst,
qosspec_t * qs,
struct conn * conn);
-int connmgr_wait(struct ae * ae,
+int connmgr_dealloc(enum ae_id id,
+ struct conn * conn);
+
+int connmgr_wait(enum ae_id id,
struct conn * conn);
#endif /* OUROBOROS_IPCPD_NORMAL_CONNMGR_H */