From fa0a0dbc88adcf9cff8bf35a253f020a49ff4084 Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@intec.ugent.be>
Date: Wed, 22 Jun 2016 16:05:56 +0200
Subject: lib: Add errnos specific for Ouroboros

This adds error numbers specificly for Ouroboros. It also refactors
some of the header files that are installed.

Fixes #2
---
 src/ipcpd/CMakeLists.txt |  1 -
 src/ipcpd/flow.c         | 54 ------------------------------------------------
 src/ipcpd/flow.h         |  9 +-------
 src/ipcpd/local/main.c   |  2 +-
 4 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 src/ipcpd/flow.c

(limited to 'src/ipcpd')

diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt
index 49bd49f2..bb482ed9 100644
--- a/src/ipcpd/CMakeLists.txt
+++ b/src/ipcpd/CMakeLists.txt
@@ -1,6 +1,5 @@
 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
deleted file mode 100644
index 4ca61341..00000000
--- a/src/ipcpd/flow.c
+++ /dev/null
@@ -1,54 +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.
- */
-
-#include <stdlib.h>
-#include "flow.h"
-
-#define OUROBOROS_PREFIX "ipcpd/flow"
-
-#include <ouroboros/logs.h>
-#include <ouroboros/flow.h>
-
-struct flow * flow_create(int port_id)
-{
-        struct flow * 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->state   = FLOW_NULL;
-
-        pthread_mutex_init(&flow->lock, NULL);
-
-        return flow;
-}
-
-void flow_destroy(struct flow * flow)
-{
-        if (flow == NULL)
-                return;
-        free(flow);
-}
diff --git a/src/ipcpd/flow.h b/src/ipcpd/flow.h
index 6f50698e..e27882e2 100644
--- a/src/ipcpd/flow.h
+++ b/src/ipcpd/flow.h
@@ -24,21 +24,14 @@
 #define OUROBOROS_IPCP_FLOW_H
 
 #include <ouroboros/list.h>
-#include <ouroboros/flow.h>
+#include <ouroboros/common.h>
 #include <ouroboros/shm_ap_rbuff.h>
 #include <pthread.h>
 
 struct flow {
-        struct list_head list;
-
         int                   port_id;
         struct shm_ap_rbuff * rb;
         enum flow_state       state;
-
-        pthread_mutex_t  lock;
 };
 
-struct flow * flow_create(int port_id);
-void          flow_destroy(struct flow * flow);
-
 #endif /* OUROBOROS_FLOW_H */
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 1e033a21..06e2b0a4 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -31,7 +31,7 @@
 #include <ouroboros/dif_config.h>
 #include <ouroboros/sockets.h>
 #include <ouroboros/bitmap.h>
-#include <ouroboros/flow.h>
+#include <ouroboros/common.h>
 #include <ouroboros/dev.h>
 
 #define OUROBOROS_PREFIX "ipcpd/local"
-- 
cgit v1.2.3