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

lib: moved flow header and source to ipcpd

6 files changed, 153 insertions, 3 deletions

diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt
index 6311e3dc..5a924ffe 100644
--- a/src/ipcpd/CMakeLists.txt
+++ b/src/ipcpd/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(IPCP_SOURCES
         # Add source files here
+        ${CMAKE_CURRENT_SOURCE_DIR}/flow.c
         ${CMAKE_CURRENT_SOURCE_DIR}/ipcp.c
         ${CMAKE_CURRENT_SOURCE_DIR}/ipcp-data.c
 )
diff --git a/src/ipcpd/flow.c b/src/ipcpd/flow.c
new file mode 100644
index 00000000..c436733b
--- /dev/null
+++ b/src/ipcpd/flow.c
@@ -0,0 +1,87 @@
+/*
+ * 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 <stdlib.h>
+#include "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;
+        }
+
+        INIT_LIST_HEAD(&flow->list);
+
+        flow->port_id = port_id;
+        flow->oflags = FLOW_O_DEFAULT;
+        flow->state = FLOW_NULL;
+
+        pthread_mutex_init(&flow->lock, NULL);
+
+        return flow;
+}
+
+void flow_destroy(flow_t * flow)
+{
+        if (flow == NULL)
+                return;
+        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;
+}
diff --git a/src/ipcpd/flow.h b/src/ipcpd/flow.h
new file mode 100644
index 00000000..000de5ad
--- /dev/null
+++ b/src/ipcpd/flow.h
@@ -0,0 +1,63 @@
+/*
+ * 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 <ouroboros/list.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_NULL = 0,
+        FLOW_ALLOCATED,
+        FLOW_PENDING
+};
+
+typedef struct flow {
+        struct list_head list;
+
+        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/ipcpd/ipcp-data.c b/src/ipcpd/ipcp-data.c
index 17649b42..2ed20943 100644
--- a/src/ipcpd/ipcp-data.c
+++ b/src/ipcpd/ipcp-data.c
@@ -22,7 +22,6 @@
  */
 
 #include "ipcp-data.h"
-#include <ouroboros/flow.h>
 #include <ouroboros/shm_du_map.h>
 #include <ouroboros/list.h>
 #include <ouroboros/utils.h>
diff --git a/src/ipcpd/ipcp-data.h b/src/ipcpd/ipcp-data.h
index d51f3730..a8db44f7 100644
--- a/src/ipcpd/ipcp-data.h
+++ b/src/ipcpd/ipcp-data.h
@@ -27,11 +27,11 @@
 #include <ouroboros/common.h>
 #include <ouroboros/instance_name.h>
 #include <ouroboros/list.h>
-#include <ouroboros/flow.h>
 #include <sys/types.h>
 #include <pthread.h>
 
 #include "ipcp-ops.h"
+#include "flow.h"
 
 struct ipcp_data {
         instance_name_t   * iname;
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 45620ee9..df731490 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -23,9 +23,9 @@
 #include <ouroboros/config.h>
 
 #include "ipcp.h"
+#include "flow.h"
 #include <ouroboros/shm_du_map.h>
 #include <ouroboros/list.h>
-#include <ouroboros/flow.h>
 #include <ouroboros/utils.h>
 #include <ouroboros/ipcp.h>
 #include <ouroboros/dif_config.h>