ipcpd: normal: First version of the fast path bootstrap

This is the first version of the fast path bootstrap in the normal
IPCP. It sets up a connection with the other end, and creates the
appropriate data structures. N+1 and N-1 SDUs are read and written and
passed through the right components.

1 files changed, 24 insertions, 2 deletions

diff --git a/src/ipcpd/normal/ribmgr.c b/src/ipcpd/normal/ribmgr.c
index 99d156f5..dd17f9bd 100644
--- a/src/ipcpd/normal/ribmgr.c
+++ b/src/ipcpd/normal/ribmgr.c
@@ -39,6 +39,7 @@
 #include "frct.h"
 #include "ipcp.h"
 #include "cdap_request.h"
+#include "rmt.h"
 
 #include "static_info.pb-c.h"
 typedef StaticInfoMsg static_info_msg_t;
@@ -241,7 +242,7 @@ int ribmgr_cdap_write(struct cdap * instance,
 
                 rib.address = msg->address;
 
-                if (frct_init(&rib.dtc, rib.address)) {
+                if (frct_init(rib.address)) {
                         ipcp_set_state(IPCP_INIT);
                         pthread_rwlock_unlock(&ipcpi.state_lock);
                         cdap_send_reply(instance, invoke_id, -1, NULL, 0);
@@ -250,6 +251,16 @@ int ribmgr_cdap_write(struct cdap * instance,
                         return -1;
                 }
 
+                if (rmt_init(rib.address)) {
+                        ipcp_set_state(IPCP_INIT);
+                        pthread_rwlock_unlock(&ipcpi.state_lock);
+                        frct_fini();
+                        cdap_send_reply(instance, invoke_id, -1, NULL, 0);
+                        static_info_msg__free_unpacked(msg, NULL);
+                        LOG_ERR("Failed to init RMT");
+                        return -1;
+                }
+
                 static_info_msg__free_unpacked(msg, NULL);
         } else {
                 ret = -1;
@@ -529,12 +540,23 @@ int ribmgr_bootstrap(struct dif_config * conf)
         /* FIXME: Set correct address. */
         rib.address = 0;
 
-        if (frct_init(&rib.dtc, rib.address)) {
+        if (frct_init(rib.address)) {
                 LOG_ERR("Failed to initialize FRCT.");
                 return -1;
         }
 
+        if (rmt_init(rib.address)) {
+                LOG_ERR("Failed to initialize RMT.");
+                frct_fini();
+                return -1;
+        }
+
         LOG_DBG("Bootstrapped RIB Manager.");
 
         return 0;
 }
+
+struct dt_const * ribmgr_dt_const()
+{
+        return &(rib.dtc);
+}