Merged in dstaesse/ouroboros/be-flow (pull request #47)

API for handling flows

4 files changed, 146 insertions, 0 deletions

diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt
index 324a85ad..0b52a2bc 100644
--- a/include/ouroboros/CMakeLists.txt
+++ b/include/ouroboros/CMakeLists.txt
@@ -9,6 +9,7 @@ set(HEADER_FILES
         da.h
         dev.h
         du_buff.h
+        flow.h
         instance_name.h
         ipcp.h
         irm.h
diff --git a/include/ouroboros/flow.h b/include/ouroboros/flow.h
new file mode 100644
index 00000000..7d8c311e
--- /dev/null
+++ b/include/ouroboros/flow.h
@@ -0,0 +1,61 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * Flows
+ *
+ *    Dimitri Staessens <dimitri.staessens@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_FLOW_H
+#define OUROBOROS_FLOW_H
+
+#include <ouroboros/common.h>
+
+#include <pthread.h>
+
+/* same values as fcntl.h */
+#define FLOW_O_RDONLY   00000000
+#define FLOW_O_WRONLY   00000001
+#define FLOW_O_RDWR     00000002
+#define FLOW_O_ACCMODE  00000003
+
+#define FLOW_O_NONBLOCK 00004000
+#define FLOW_O_DEFAULT  00000002
+
+#define FLOW_O_INVALID  (FLOW_O_WRONLY | FLOW_O_RDWR)
+
+enum flow_state {
+        FLOW_INIT = 0,
+        FLOW_ALLOCATED,
+        FLOW_PENDING
+};
+
+typedef struct flow {
+        int32_t         port_id;
+        uint16_t        oflags;
+        enum flow_state state;
+
+        pthread_mutex_t lock;
+} flow_t;
+
+flow_t * flow_create(int32_t   port_id);
+void     flow_destroy(flow_t * flow);
+
+int      flow_set_opts(flow_t * flow, uint16_t opts);
+uint16_t flow_get_opts(const flow_t * flow);
+
+#endif /* OUROBOROS_FLOW_H */
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index f18b4d3b..1f7b0f55 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -26,6 +26,7 @@ set(SOURCE_FILES
   da.c
   dev.c
   du_buff.c
+  flow.c
   instance_name.c
   ipcp.c
   irm.c
diff --git a/src/lib/flow.c b/src/lib/flow.c
new file mode 100644
index 00000000..04166298
--- /dev/null
+++ b/src/lib/flow.c
@@ -0,0 +1,83 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * Flows
+ *
+ *    Dimitri Staessens <dimitri.staessens@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.
+ */
+
+#include <malloc.h>
+#include <ouroboros/flow.h>
+
+#define OUROBOROS_PREFIX "ipcpd/flow"
+
+#include <ouroboros/logs.h>
+
+flow_t * flow_create(int32_t port_id)
+{
+        flow_t * flow = malloc(sizeof *flow);
+        if (flow == NULL) {
+                LOG_DBGF("Could not malloc flow.");
+                return NULL;
+        }
+
+        flow->port_id = port_id;
+        flow->oflags = FLOW_O_DEFAULT;
+        flow->state = FLOW_INIT;
+
+        pthread_mutex_init(&flow->lock, NULL);
+
+        return flow;
+}
+
+void flow_destroy(flow_t * flow)
+{
+        free(flow);
+}
+
+int flow_set_opts(flow_t * flow, uint16_t opts)
+{
+        if (flow == NULL) {
+                LOG_DBGF("Non-existing flow.");
+                return -1;
+        }
+
+        pthread_mutex_lock(&flow->lock);
+
+        if ((opts & FLOW_O_ACCMODE) == FLOW_O_ACCMODE) {
+                flow->oflags = FLOW_O_DEFAULT;
+                pthread_mutex_unlock(&flow->lock);
+                LOG_WARN("Invalid flow options. Setting default.");
+                return -1;
+        }
+
+        flow->oflags = opts;
+
+        pthread_mutex_unlock(&flow->lock);
+
+        return 0;
+}
+
+uint16_t flow_get_opts(const flow_t * flow)
+{
+        if (flow == NULL) {
+                LOG_DBGF("Non-existing flow.");
+                return FLOW_O_INVALID;
+        }
+
+        return flow->oflags;
+}