Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be

3 files changed, 151 insertions, 0 deletions

diff --git a/include/ouroboros/common.h b/include/ouroboros/common.h
new file mode 100644
index 00000000..4d76d230
--- /dev/null
+++ b/include/ouroboros/common.h
@@ -0,0 +1,51 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * Common definitions
+ *
+ *    Sander Vrijders <sander.vrijders@intec.ugent.be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef OUROBOROS_COMMON_H
+#define OUROBOROS_COMMON_H
+
+#include <stdint.h>
+
+typedef uint32_t port_id_t;
+
+/* FIXME: To be moved into a separate file */
+typedef struct {
+        char * data;
+        size_t size;
+} buffer_t;
+
+typedef struct {
+        char * ap_name;
+        int ap_id;
+        char * ae_name;
+        int ae_id;
+} rina_name_t;
+
+/* FIXME: To be extended to have all QoS params */
+struct qos_spec {
+        char * name;
+        char * dif_name;
+        double delay;
+        double jitter;
+};
+
+#endif
diff --git a/include/ouroboros/dev.h b/include/ouroboros/dev.h
new file mode 100644
index 00000000..217352ef
--- /dev/null
+++ b/include/ouroboros/dev.h
@@ -0,0 +1,52 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * API for applications
+ *
+ *    Sander Vrijders <sander.vrijders@intec.ugent.be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef OUROBOROS_DEV_H
+#define OUROBOROS_DEV_H
+
+#include "common.h"
+
+struct qos_spec * list_qos_cubes(rina_name_t dst,
+                                 struct qos_spec min_qos);
+
+/* Returns file descriptor */
+int ap_reg(rina_name_t name, char ** difs);
+int ap_unreg(rina_name_t name, char ** difs);
+
+/* Returns file descriptor (> 0) */
+int flow_accept(int fd, rina_name_t * name);
+int flow_alloc_resp(int fd, int result);
+
+/* Returns file descriptor */
+int flow_alloc(rina_name_t src, rina_name_t dst,
+               struct qos_spec qos, int oflags);
+
+/* If flow is accepted returns a value > 0 */
+int flow_alloc_res(int fd);
+int flow_dealloc(int fd);
+
+/* Wraps around fnctl */
+int flow_cntl(int fd, int oflags);
+int flow_write(int fd, buffer_t * sdu);
+int flow_read(int fd, buffer_t * sdu);
+
+#endif
diff --git a/include/ouroboros/logs.h b/include/ouroboros/logs.h
new file mode 100644
index 00000000..c72fb9ae
--- /dev/null
+++ b/include/ouroboros/logs.h
@@ -0,0 +1,48 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * Logging facilities
+ *
+ *    Sander Vrijders <sander.vrijders@intec.ugent.be>
+ *    Francesco Salvestrini <f.salvestrini@nextworks.it>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef OUROBOROS_LOGS_H
+#define OUROBOROS_LOGS_H
+
+#include <stdio.h>
+
+#ifndef OUROBOROS_PREFIX
+#error You must define OUROBOROS_PREFIX before including this file
+#endif
+
+#define __LOG(PFX, LVL, FMT, ARGS...)                                   \
+        do { printf(PFX "(" LVL "): " FMT "\n", ##ARGS); } while (0)
+
+#define LOG_ERR(FMT,   ARGS...) __LOG(OUROBOROS_PREFIX, "ERR",  FMT, ##ARGS)
+#define LOG_WARN(FMT,  ARGS...) __LOG(OUROBOROS_PREFIX, "WARN", FMT, ##ARGS)
+#define LOG_INFO(FMT,  ARGS...) __LOG(OUROBOROS_PREFIX, "INFO", FMT, ##ARGS)
+
+#ifdef CONFIG_OUROBOROS_DEBUG
+#define LOG_DBG(FMT,   ARGS...) __LOG(OUROBOROS_PREFIX, "DBG", FMT, ##ARGS)
+#else
+#define LOG_DBG(FMT,   ARGS...) do { } while (0)
+#endif
+
+#define LOG_MISSING LOG_ERR("Missing code in %s:%d",__FILE__, __LINE__)
+
+#endif