Merged in dstaesse/ouroboros/be-rib (pull request #350)

Be rib

5 files changed, 138 insertions, 1 deletions

diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in
index 4b5943c5..5597bb0b 100644
--- a/include/ouroboros/config.h.in
+++ b/include/ouroboros/config.h.in
@@ -61,5 +61,6 @@
 #define SOCKET_TIMEOUT         4000
 #define CDAP_REPLY_TIMEOUT     1000
 #define ENROLL_TIMEOUT         2000
+#define RIB_MAX_PATH_LEN       256
 
 #endif
diff --git a/include/ouroboros/fqueue.h b/include/ouroboros/fqueue.h
index d34665d6..254648e6 100644
--- a/include/ouroboros/fqueue.h
+++ b/include/ouroboros/fqueue.h
@@ -59,4 +59,4 @@ int          flow_event_wait(flow_set_t *            set,
                              fqueue_t *              fq,
                              const struct timespec * timeout);
 
-#endif /* OUROBOROS_SELECT_H */
+#endif /* OUROBOROS_FQUEUE_H */
diff --git a/include/ouroboros/list.h b/include/ouroboros/list.h
index 824e6684..5f246775 100644
--- a/include/ouroboros/list.h
+++ b/include/ouroboros/list.h
@@ -54,6 +54,9 @@ void list_add_tail(struct list_head * e,
 
 void list_del(struct list_head * e);
 
+void list_move(struct list_head * dst,
+               struct list_head * src);
+
 bool list_is_empty(struct list_head * h);
 
 #endif
diff --git a/include/ouroboros/rib.h b/include/ouroboros/rib.h
new file mode 100644
index 00000000..5acf0330
--- /dev/null
+++ b/include/ouroboros/rib.h
@@ -0,0 +1,61 @@
+/*
+ * Ouroboros - Copyright (C) 2016 - 2017
+ *
+ * Resource Information Base
+ *
+ *    Sander Vrijders   <sander.vrijders@intec.ugent.be>
+ *    Dimitri Staessens <dimitri.staessens@intec.ugent.be>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef OUROBOROS_LIB_RIB_H
+#define OUROBOROS_LIB_RIB_H
+
+#include <sys/types.h>
+#include <stdbool.h>
+
+#define RIB_ROOT ""
+
+int     rib_init(void);
+
+void    rib_fini(void);
+
+int     rib_add(const char * parent,
+                const char * name);
+
+int     rib_del(char * path);
+
+ssize_t rib_read(const char * path,
+                 void *       data,
+                 size_t       len);
+
+int     rib_write(const char * path,
+                  const void * data,
+                  size_t       len);
+
+int     rib_put(const char * path,
+                void *       data,
+                size_t       len);
+
+bool    rib_has(const char * path);
+
+char *  rib_path_append(char *       path,
+                        const char * name);
+
+char *  rib_name_gen(void * data,
+                     size_t len);
+
+#endif /* OUROBOROS_LIB_RIB_H */
diff --git a/include/ouroboros/rqueue.h b/include/ouroboros/rqueue.h
new file mode 100644
index 00000000..7bfbfa8f
--- /dev/null
+++ b/include/ouroboros/rqueue.h
@@ -0,0 +1,72 @@
+/*
+ * Ouroboros - Copyright (C) 2016 - 2017
+ *
+ * RIB event queues
+ *
+ *    Dimitri Staessens <dimitri.staessens@intec.ugent.be>
+ *    Sander Vrijders   <sander.vrijders@intec.ugent.be>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef OUROBOROS_RQUEUE_H
+#define OUROBOROS_RQUEUE_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <time.h>
+
+#define RO_READ    0x00000001
+#define RO_MODIFY  0x00000002
+#define RO_CREATE  0x00000004
+#define RO_DELETE  0x00000008
+#define RO_START   0x00000010
+#define RO_STOP    0x00000020
+
+#define RO_NO_OPS  0x00000000
+#define RO_ALL_OPS 0xFFFFFFFF
+
+struct ro_set;
+
+struct rqueue;
+
+typedef struct ro_set ro_set_t;
+typedef struct rqueue rqueue_t;
+
+ro_set_t *   ro_set_create(void);
+
+void         ro_set_destroy(ro_set_t * set);
+
+rqueue_t *   rqueue_create(void);
+
+int          rqueue_destroy(struct rqueue * rq);
+
+int          ro_set_zero(ro_set_t * set);
+
+int          ro_set_add(ro_set_t *   set,
+                        const char * path,
+                        int32_t      flags);
+
+int          ro_set_del(ro_set_t *   set,
+                        const char * path);
+
+int32_t      rqueue_next(rqueue_t * rq,
+                         char *     path);
+
+int          rib_event_wait(ro_set_t *              set,
+                            rqueue_t *              rq,
+                            const struct timespec * timeout);
+
+#endif /* OUROBOROS_RQUEUE_H */