From 7ba0fd0ce19244745c8d2512ce8a003783d914a7 Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@ugent.be>
Date: Thu, 30 Mar 2017 20:33:22 +0200
Subject: lib: Revise flow allocation API

The flow_alloc_res and flow_alloc_resp calls have been removed. The
flow_alloc and flow_accept calls are now both blocking and take an
additional timeout argument.
---
 src/tools/echo/echo_client.c | 12 ++----------
 src/tools/echo/echo_server.c | 22 ++++++++--------------
 2 files changed, 10 insertions(+), 24 deletions(-)

(limited to 'src/tools/echo')

diff --git a/src/tools/echo/echo_client.c b/src/tools/echo/echo_client.c
index f84de73a..5ec2051f 100644
--- a/src/tools/echo/echo_client.c
+++ b/src/tools/echo/echo_client.c
@@ -26,25 +26,17 @@
 int client_main(void)
 {
         int fd = 0;
-        int result = 0;
         char buf[BUF_SIZE];
         char * message  = "Client says hi!";
         ssize_t count = 0;
 
-        fd = flow_alloc("echo", NULL);
+        fd = flow_alloc("echo", NULL, NULL);
         if (fd < 0) {
                 printf("Failed to allocate flow.\n");
                 return -1;
         }
 
-        result = flow_alloc_res(fd);
-        if (result < 0) {
-                printf("Flow allocation refused.\n");
-                flow_dealloc(fd);
-                return -1;
-        }
-
-        if (flow_write(fd, message, strlen(message) + 1) == -1) {
+        if (flow_write(fd, message, strlen(message) + 1) < 0) {
                 printf("Failed to write SDU.\n");
                 flow_dealloc(fd);
                 return -1;
diff --git a/src/tools/echo/echo_server.c b/src/tools/echo/echo_server.c
index aa136485..771155f4 100644
--- a/src/tools/echo/echo_server.c
+++ b/src/tools/echo/echo_server.c
@@ -37,7 +37,7 @@ void shutdown_server(int signo)
 
 int server_main(void)
 {
-        int    client_fd = 0;
+        int    fd = 0;
         char   buf[BUF_SIZE];
         ssize_t count = 0;
         qosspec_t qs;
@@ -51,36 +51,30 @@ int server_main(void)
         }
 
         while (true) {
-                client_fd = flow_accept(&qs);
-                if (client_fd < 0) {
+                fd = flow_accept(&qs, NULL);
+                if (fd < 0) {
                         printf("Failed to accept flow.\n");
                         break;
                 }
 
                 printf("New flow.\n");
 
-                if (flow_alloc_resp(client_fd, 0)) {
-                        printf("Failed to give an allocate response.\n");
-                        flow_dealloc(client_fd);
-                        continue;
-                }
-
-                count = flow_read(client_fd, &buf, BUF_SIZE);
+                count = flow_read(fd, &buf, BUF_SIZE);
                 if (count < 0) {
                         printf("Failed to read SDU.\n");
-                        flow_dealloc(client_fd);
+                        flow_dealloc(fd);
                         continue;
                 }
 
                 printf("Message from client is %.*s.\n", (int) count, buf);
 
-                if (flow_write(client_fd, buf, count) == -1) {
+                if (flow_write(fd, buf, count) == -1) {
                         printf("Failed to write SDU.\n");
-                        flow_dealloc(client_fd);
+                        flow_dealloc(fd);
                         continue;
                 }
 
-                flow_dealloc(client_fd);
+                flow_dealloc(fd);
         }
 
         return 0;
-- 
cgit v1.2.3