From c96efb13edfaf9b2f2c626bd2a5d5d5afd38155f Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@intec.ugent.be>
Date: Sun, 18 Sep 2016 06:27:43 +0200
Subject: lib, ipcp: Revise fast path and flow interfaces

IPCPs can now use ap_init() to initialize the memory. All flows are
accessed using flow descriptors, this greatly simplifies IPCP
development. Reverts the fast path to a single ap_rbuff per process.
Splits lib/ipcp into irmd/ipcp and lib/ipcp-dev.  Adds a lib/shim-dev
holding tailored functions for shims.  Moves the buffer_t to utils.h.
Fixes the shim-eth-llc length field.  Removes the flow from shared.h.

Fixes #4
Fixes #5
---
 src/tools/cbr/cbr_server.c     | 7 ++++---
 src/tools/irm/irm.c            | 1 -
 src/tools/irm/irm_utils.c      | 1 -
 src/tools/oping/oping_client.c | 3 ++-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/cbr/cbr_server.c b/src/tools/cbr/cbr_server.c
index 8eff4a4c..c5664d8b 100644
--- a/src/tools/cbr/cbr_server.c
+++ b/src/tools/cbr/cbr_server.c
@@ -21,6 +21,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <ouroboros/dev.h>
+#include <ouroboros/time_utils.h>
+#include <ouroboros/fcntl.h>
+
 #include <stdbool.h>
 
 #ifdef __FreeBSD__
@@ -32,9 +36,6 @@
 #include <stdlib.h>
 #include <pthread.h>
 
-#include <ouroboros/dev.h>
-#include <ouroboros/time_utils.h>
-
 #define THREADS_SIZE 10
 
 pthread_t       listen_thread;
diff --git a/src/tools/irm/irm.c b/src/tools/irm/irm.c
index c260feb9..a674c7ba 100644
--- a/src/tools/irm/irm.c
+++ b/src/tools/irm/irm.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <ouroboros/common.h>
 #include <ouroboros/irm.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/tools/irm/irm_utils.c b/src/tools/irm/irm_utils.c
index feb8ac98..41a1e811 100644
--- a/src/tools/irm/irm_utils.c
+++ b/src/tools/irm/irm_utils.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <ouroboros/common.h>
 
 #include "irm_utils.h"
 
diff --git a/src/tools/oping/oping_client.c b/src/tools/oping/oping_client.c
index 3a254984..47b40118 100644
--- a/src/tools/oping/oping_client.c
+++ b/src/tools/oping/oping_client.c
@@ -22,7 +22,7 @@
  */
 
 #include <ouroboros/dev.h>
-#include <ouroboros/errno.h>
+#include <ouroboros/fcntl.h>
 #include <ouroboros/time_utils.h>
 
 #ifdef __FreeBSD__
@@ -34,6 +34,7 @@
 #include <sys/time.h>
 #include <arpa/inet.h>
 #include <math.h>
+#include <errno.h>
 #include <float.h>
 
 void shutdown_client(int signo, siginfo_t * info, void * c)
-- 
cgit v1.2.3