Merged in sandervrijders/ouroboros/be-ae (pull request #392)

lib: Remove application entity name

8 files changed, 8 insertions, 8 deletions

diff --git a/src/tools/cbr/cbr_client.c b/src/tools/cbr/cbr_client.c
index 173dab24..48a18cd1 100644
--- a/src/tools/cbr/cbr_client.c
+++ b/src/tools/cbr/cbr_client.c
@@ -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..b0be9d7b 100644
--- a/src/tools/cbr/cbr_server.c
+++ b/src/tools/cbr/cbr_server.c
@@ -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;
diff --git a/src/tools/echo/echo_client.c b/src/tools/echo/echo_client.c
index 783188d5..3036d338 100644
--- a/src/tools/echo/echo_client.c
+++ b/src/tools/echo/echo_client.c
@@ -30,7 +30,7 @@ int client_main(void)
         char * message  = "Client says hi!";
         ssize_t count = 0;
 
-        fd = flow_alloc("echo", NULL, NULL);
+        fd = flow_alloc("echo", NULL);
         if (fd < 0) {
                 printf("Failed to allocate flow.\n");
                 return -1;
diff --git a/src/tools/echo/echo_server.c b/src/tools/echo/echo_server.c
index 8940a0b5..94c54eee 100644
--- a/src/tools/echo/echo_server.c
+++ b/src/tools/echo/echo_server.c
@@ -50,7 +50,7 @@ int server_main(void)
         }
 
         while (true) {
-                client_fd = flow_accept(NULL, &qs);
+                client_fd = flow_accept(&qs);
                 if (client_fd < 0) {
                         printf("Failed to accept flow.\n");
                         break;
diff --git a/src/tools/operf/operf_client.c b/src/tools/operf/operf_client.c
index 5b31e27b..0c943cf7 100644
--- a/src/tools/operf/operf_client.c
+++ b/src/tools/operf/operf_client.c
@@ -182,7 +182,7 @@ int client_main(void)
         client.sent = 0;
         client.rcvd = 0;
 
-        fd = flow_alloc(client.s_apn, NULL, NULL);
+        fd = flow_alloc(client.s_apn, NULL);
         if (fd < 0) {
                 printf("Failed to allocate flow.\n");
                 return -1;
diff --git a/src/tools/operf/operf_server.c b/src/tools/operf/operf_server.c
index 3c3b9788..f23b52f3 100644
--- a/src/tools/operf/operf_server.c
+++ b/src/tools/operf/operf_server.c
@@ -108,7 +108,7 @@ void * accept_thread(void * o)
         printf("Ouroboros perf server started.\n");
 
         while (true) {
-                fd = flow_accept(NULL, &qs);
+                fd = flow_accept(&qs);
                 if (fd < 0) {
                         printf("Failed to accept flow.\n");
                         break;
diff --git a/src/tools/oping/oping_client.c b/src/tools/oping/oping_client.c
index 99c11a68..253ea168 100644
--- a/src/tools/oping/oping_client.c
+++ b/src/tools/oping/oping_client.c
@@ -213,7 +213,7 @@ int client_main(void)
                 return -1;
         }
 
-        fd = flow_alloc(client.s_apn, NULL, NULL);
+        fd = flow_alloc(client.s_apn, NULL);
         if (fd < 0) {
                 printf("Failed to allocate flow.\n");
                 return -1;
diff --git a/src/tools/oping/oping_server.c b/src/tools/oping/oping_server.c
index 24cd9bf1..e0a6655b 100644
--- a/src/tools/oping/oping_server.c
+++ b/src/tools/oping/oping_server.c
@@ -119,7 +119,7 @@ void * accept_thread(void * o)
         printf("Ouroboros ping server started.\n");
 
         while (true) {
-                fd = flow_accept(NULL, &qs);
+                fd = flow_accept(&qs);
                 if (fd < 0) {
                         printf("Failed to accept flow.\n");
                         break;