Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be

4 files changed, 11 insertions, 11 deletions

diff --git a/src/tools/cbr/CMakeLists.txt b/src/tools/cbr/CMakeLists.txt
index 232bea36..1883141c 100644
--- a/src/tools/cbr/CMakeLists.txt
+++ b/src/tools/cbr/CMakeLists.txt
@@ -5,9 +5,9 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
 set(SOURCE_FILES
-        # Add source files here
-        cbr.c
-)
+  # Add source files here
+  cbr.c
+  )
 
 add_executable(cbr ${SOURCE_FILES})
 
diff --git a/src/tools/cbr/cbr.c b/src/tools/cbr/cbr.c
index ef8a58ba..cd29c9ad 100644
--- a/src/tools/cbr/cbr.c
+++ b/src/tools/cbr/cbr.c
@@ -3,8 +3,8 @@
  *
  * CBR traffic generator
  *
- *    Dimitri Staessens <[email protected]>
- *    Sander Vrijders   <[email protected]>
+ *    Dimitri Staessens <[email protected]>
+ *    Sander Vrijders   <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/tools/cbr/cbr_client.c b/src/tools/cbr/cbr_client.c
index 173dab24..16ade13d 100644
--- a/src/tools/cbr/cbr_client.c
+++ b/src/tools/cbr/cbr_client.c
@@ -3,8 +3,8 @@
  *
  * A simple CBR generator
  *
- *    Dimitri Staessens <[email protected]>
- *    Sander Vrijders <[email protected]>
+ *    Dimitri Staessens <[email protected]>
+ *    Sander Vrijders   <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -90,7 +90,7 @@ int client_main(char * server,
         printf("Client started, duration %d, rate %lu b/s, size %d B.\n",
                duration, rate, size);
 
-        fd = flow_alloc(server, NULL, NULL);
+        fd = flow_alloc(server, NULL);
         if (fd < 0) {
                 printf("Failed to allocate flow.\n");
                 return -1;
diff --git a/src/tools/cbr/cbr_server.c b/src/tools/cbr/cbr_server.c
index 7105ff09..9198858c 100644
--- a/src/tools/cbr/cbr_server.c
+++ b/src/tools/cbr/cbr_server.c
@@ -3,8 +3,8 @@
  *
  * A simple CBR generator
  *
- *    Dimitri Staessens <[email protected]>
- *    Sander Vrijders   <[email protected]>
+ *    Dimitri Staessens <[email protected]>
+ *    Sander Vrijders   <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -164,7 +164,7 @@ static void * listener(void * o)
                server_settings.interval, server_settings.timeout);
 
         while (true) {
-                client_fd = flow_accept(NULL, &qs);
+                client_fd = flow_accept(&qs);
                 if (client_fd < 0) {
                         printf("Failed to accept flow.\n");
                         break;