summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-08-25 17:19:17 +0200
committerdimitri staessens <dimitri.staessens@ugent.be>2017-08-28 15:24:16 +0200
commit176698e8c2fd7ab8007b8074515d6144e7177d8e (patch)
tree6fa097b57aaafe3143b1f17e528479aa0624a005 /include
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 'include')
-rw-r--r--include/ouroboros/ipcp.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index 11095ba6..2d785fbb 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -27,15 +27,17 @@
#include <unistd.h>
#include <stdbool.h>
+#define DIF_NAME_SIZE 256
+
/*
* NOTE: the IRMd uses this order to select an IPCP
- * for flow allocation
+ * for flow allocation.
*/
enum ipcp_type {
IPCP_LOCAL = 0,
+ IPCP_NORMAL,
IPCP_SHIM_ETH_LLC,
- IPCP_SHIM_UDP,
- IPCP_NORMAL
+ IPCP_SHIM_UDP
};
/* Normal IPCP policies */
@@ -43,10 +45,6 @@ enum pol_addr_auth {
FLAT_RANDOM = 0
};
-enum pol_gam {
- COMPLETE = 0
-};
-
enum pol_routing {
LINK_STATE = 0
};
@@ -58,8 +56,6 @@ enum pol_dir_hash {
DIR_HASH_SHA3_512
};
-#define DIF_NAME_SIZE 256
-
/* Info reported back to the IRMd about the DIF on enrollment */
struct dif_info {
char dif_name[DIF_NAME_SIZE];
@@ -78,8 +74,6 @@ struct ipcp_config {
bool has_ttl;
enum pol_addr_auth addr_auth_type;
- enum pol_gam dt_gam_type;
- enum pol_gam rm_gam_type;
enum pol_routing routing_type;
/* Shim UDP */