lib: api for handling flows

moved the flow definition to the library and made it public.
thread-safety implemented without compiler checks.

4 files changed, 9 insertions, 81 deletions

diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt
index 27d41801..bcb5b986 100644
--- a/src/ipcpd/CMakeLists.txt
+++ b/src/ipcpd/CMakeLists.txt
@@ -9,7 +9,6 @@ set(SOURCE_FILES
         main.c
         pci.c
         shm_pci.c
-        flow.c
 )
 
 add_executable (ipcpd ${SOURCE_FILES})
diff --git a/src/ipcpd/flow.h b/src/ipcpd/flow.h
deleted file mode 100644
index 83f4076d..00000000
--- a/src/ipcpd/flow.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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 IPCPD_FLOW_H
-#define IPCPD_FLOW_H
-
-#include <ouroboros/common.h>
-
-#ifdef FLOW_MT_SAFE
-#include <pthread.h>
-#endif
-
-/* 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  00037777
-
-typedef long port_id_t;
-
-enum flow_state {
-        FLOW_INIT = 0,
-        FLOW_ALLOCATED,
-        FLOW_PENDING
-};
-
-typedef struct flow {
-        port_id_t       port_id;
-        uint16_t        flags;
-        uint8_t         state;
-#ifdef FLOW_MT_SAFE
-        pthread_mutex_t lock;
-#endif
-} flow_t;
-
-flow_t * flow_create(port_id_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 /* IPCPD_FLOW_H */
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 42a4d5c0..7a78bf3e 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -21,6 +21,7 @@ set(SOURCE_FILES
         da.c
         dev.c
         du_buff.c
+        flow.c
         ipcp.c
         irm.c
         list.c
diff --git a/src/ipcpd/flow.c b/src/lib/flow.c
index 395a0a0d..67b8e71b 100644
--- a/src/ipcpd/flow.c
+++ b/src/lib/flow.c
@@ -20,23 +20,22 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "flow.h"
 #include <malloc.h>
+#include <ouroboros/flow.h>
 
 #define OUROBOROS_PREFIX "ipcpd/flow"
 
 #include <ouroboros/logs.h>
 
-flow_t * flow_create(port_id_t port_id)
+flow_t * flow_create(int32_t port_id)
 {
         flow_t * flow = malloc(sizeof *flow);
         flow->port_id = port_id;
-        flow->flags = FLOW_O_DEFAULT;
+        flow->oflags = FLOW_O_DEFAULT;
         flow->state = FLOW_INIT;
 
-#ifdef FLOW_MT_SAFE
         pthread_mutex_init(&flow->lock, NULL);
-#endif
+
         return flow;
 }
 
@@ -52,23 +51,18 @@ int flow_set_opts(flow_t * flow, uint16_t opts)
                 return -1;
         }
 
-#ifdef FLOW_MT_SAFE
         pthread_mutex_lock(&flow->lock);
-#endif
 
         if ((opts & FLOW_O_ACCMODE) == FLOW_O_ACCMODE) {
-#ifdef FLOW_MT_SAFE
                 pthread_mutex_unlock(&flow->lock);
-#endif
                 LOG_WARN("Invalid flow options. Setting default.");
                 opts = FLOW_O_DEFAULT;
         }
 
-        flow->flags = opts;
+        flow->oflags = opts;
+
+        pthread_mutex_unlock(&flow->lock);
 
-#ifdef FLOW_MT_SAFE
-                pthread_mutex_unlock(&flow->lock);
-#endif
         return 0;
 }
 
@@ -79,5 +73,5 @@ uint16_t flow_get_opts(const flow_t * flow)
                 return FLOW_O_INVALID;
         }
 
-        return flow->flags;
+        return flow->oflags;
 }