From 176698e8c2fd7ab8007b8074515d6144e7177d8e Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Fri, 25 Aug 2017 17:19:17 +0200 Subject: 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. --- src/ipcpd/normal/routing.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/ipcpd/normal/routing.c') diff --git a/src/ipcpd/normal/routing.c b/src/ipcpd/normal/routing.c index c00ec67c..04e6fd76 100644 --- a/src/ipcpd/normal/routing.c +++ b/src/ipcpd/normal/routing.c @@ -29,36 +29,35 @@ #include "routing.h" #include "pol/link_state.h" -struct { - struct pol_routing_ops * ops; -} routing; + +struct pol_routing_ops * r_ops; int routing_init(enum pol_routing pr, struct nbs * nbs) { switch (pr) { case LINK_STATE: - routing.ops = &link_state_ops; + r_ops = &link_state_ops; break; default: log_err("Unknown routing type."); return -1; } - return routing.ops->init(nbs); + return r_ops->init(nbs); } struct routing_i * routing_i_create(struct pff * pff) { - return routing.ops->routing_i_create(pff); + return r_ops->routing_i_create(pff); } void routing_i_destroy(struct routing_i * instance) { - return routing.ops->routing_i_destroy(instance); + return r_ops->routing_i_destroy(instance); } void routing_fini(void) { - routing.ops->fini(); + r_ops->fini(); } -- cgit v1.2.3