Merged in sandervrijders/ouroboros/be-ae-conn (pull request #396)

ipcpd: normal: Refactor application entities and add neighbors struct

1 files changed, 68 insertions, 16 deletions

diff --git a/src/ipcpd/normal/ribmgr.c b/src/ipcpd/normal/ribmgr.c
index 25f1687e..e8fa77a4 100644
--- a/src/ipcpd/normal/ribmgr.c
+++ b/src/ipcpd/normal/ribmgr.c
@@ -45,25 +45,70 @@
 #include <assert.h>
 
 struct {
-        flow_set_t *   fs;
-        fqueue_t *     fq;
-        struct gam *   gam;
+        flow_set_t *       fs;
+        fqueue_t *         fq;
+
+        struct gam *       gam;
+        struct nbs *       nbs;
+        struct ae *        ae;
+
+        struct nb_notifier nb_notifier;
 } ribmgr;
 
+static int ribmgr_neighbor_event(enum nb_event event,
+                                 struct conn   conn)
+{
+        /* We are only interested in neighbors being added and removed. */
+        switch (event) {
+        case NEIGHBOR_ADDED:
+                flow_set_add(ribmgr.fs, conn.flow_info.fd);
+                break;
+        case NEIGHBOR_REMOVED:
+                flow_set_del(ribmgr.fs, conn.flow_info.fd);
+                break;
+        default:
+                break;
+        }
+
+        return 0;
+}
 
 int ribmgr_init(void)
 {
-        enum pol_gam   pg;
+        enum pol_gam     pg;
+        struct conn_info info;
+
+        strcpy(info.ae_name, MGMT_AE);
+        strcpy(info.protocol, CDAP_PROTO);
+        info.pref_version = 1;
+        info.pref_syntax = PROTO_GPB;
+
+        ribmgr.nbs = nbs_create();
+        if (ribmgr.nbs == NULL) {
+                log_err("Failed to create neighbors.");
+                return -1;
+        }
+
+        ribmgr.ae = connmgr_ae_create(info);
+        if (ribmgr.ae == NULL) {
+                log_err("Failed to create AE struct.");
+                nbs_destroy(ribmgr.nbs);
+                return -1;
+        }
 
         if (rib_read(BOOT_PATH "/rm/gam/type", &pg, sizeof(pg))
             != sizeof(pg)) {
                 log_err("Failed to read policy for ribmgr gam.");
+                connmgr_ae_destroy(ribmgr.ae);
+                nbs_destroy(ribmgr.nbs);
                 return -1;
         }
 
-        ribmgr.gam = gam_create(pg);
+        ribmgr.gam = gam_create(pg, ribmgr.nbs, ribmgr.ae);
         if (ribmgr.gam == NULL) {
                 log_err("Failed to create gam.");
+                connmgr_ae_destroy(ribmgr.ae);
+                nbs_destroy(ribmgr.nbs);
                 return -1;
         }
 
@@ -71,6 +116,8 @@ int ribmgr_init(void)
         if (ribmgr.fs == NULL) {
                 log_err("Failed to create flow set.");
                 gam_destroy(ribmgr.gam);
+                connmgr_ae_destroy(ribmgr.ae);
+                nbs_destroy(ribmgr.nbs);
                 return -1;
         }
 
@@ -79,6 +126,19 @@ int ribmgr_init(void)
                 log_err("Failed to create fq.");
                 flow_set_destroy(ribmgr.fs);
                 gam_destroy(ribmgr.gam);
+                connmgr_ae_destroy(ribmgr.ae);
+                nbs_destroy(ribmgr.nbs);
+                return -1;
+        }
+
+        ribmgr.nb_notifier.notify_call = ribmgr_neighbor_event;
+        if (nbs_reg_notifier(ribmgr.nbs, &ribmgr.nb_notifier)) {
+                log_err("Failed to register notifier.");
+                fqueue_destroy(ribmgr.fq);
+                flow_set_destroy(ribmgr.fs);
+                gam_destroy(ribmgr.gam);
+                connmgr_ae_destroy(ribmgr.ae);
+                nbs_destroy(ribmgr.nbs);
                 return -1;
         }
 
@@ -87,20 +147,12 @@ int ribmgr_init(void)
 
 void ribmgr_fini(void)
 {
+        nbs_unreg_notifier(ribmgr.nbs, &ribmgr.nb_notifier);
         flow_set_destroy(ribmgr.fs);
         fqueue_destroy(ribmgr.fq);
         gam_destroy(ribmgr.gam);
-}
-
-int ribmgr_flow_arr(int       fd,
-                    qosspec_t qs)
-{
-        assert(ribmgr.gam);
-
-        if (gam_flow_arr(ribmgr.gam, fd, qs))
-                return -1;
-
-        return 0;
+        connmgr_ae_destroy(ribmgr.ae);
+        nbs_destroy(ribmgr.nbs);
 }
 
 int ribmgr_disseminate(char *           path,