tools: Refactor echo to single source file

This simplifies the echo-app tool implementation to a single source
file since it's meant to be a small example application.

Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>

3 files changed, 73 insertions, 127 deletions

diff --git a/src/tools/echo/echo.c b/src/tools/echo/echo.c
index 91ab552d..27dad38b 100644
--- a/src/tools/echo/echo.c
+++ b/src/tools/echo/echo.c
@@ -22,14 +22,13 @@
 
 #define _POSIX_C_SOURCE 199309L
 
+#include <ouroboros/dev.h>
+
 #include <stdio.h>
 #include <string.h>
 
 #define BUF_SIZE 256
 
-#include "echo_client.c"
-#include "echo_server.c"
-
 static void usage(void)
 {
         printf("Usage: echo-app [OPTION]...\n"
@@ -38,6 +37,77 @@ static void usage(void)
                "      --help                Display this help text and exit\n");
 }
 
+int server_main(void)
+{
+        int     fd = 0;
+        char    buf[BUF_SIZE];
+        ssize_t count = 0;
+
+        printf("Starting the server.\n");
+
+        while (true) {
+                fd = flow_accept(NULL, NULL);
+                if (fd < 0) {
+                        printf("Failed to accept flow.\n");
+                        break;
+                }
+
+                printf("New flow.\n");
+
+                count = flow_read(fd, &buf, BUF_SIZE);
+                if (count < 0) {
+                        printf("Failed to read SDU.\n");
+                        flow_dealloc(fd);
+                        continue;
+                }
+
+                printf("Message from client is %.*s.\n", (int) count, buf);
+
+                if (flow_write(fd, buf, count) == -1) {
+                        printf("Failed to write SDU.\n");
+                        flow_dealloc(fd);
+                        continue;
+                }
+
+                flow_dealloc(fd);
+        }
+
+        return 0;
+}
+
+int client_main(void)
+{
+        int     fd      = 0;
+        char    buf[BUF_SIZE];
+        char *  message = "Client says hi!";
+        ssize_t count   = 0;
+
+        fd = flow_alloc("echo", NULL, NULL);
+        if (fd < 0) {
+                printf("Failed to allocate flow.\n");
+                return -1;
+        }
+
+        if (flow_write(fd, message, strlen(message) + 1) < 0) {
+                printf("Failed to write SDU.\n");
+                flow_dealloc(fd);
+                return -1;
+        }
+
+        count = flow_read(fd, buf, BUF_SIZE);
+        if (count < 0) {
+                printf("Failed to read SDU.\n");
+                flow_dealloc(fd);
+                return -1;
+        }
+
+        printf("Server replied with %.*s\n", (int) count, buf);
+
+        flow_dealloc(fd);
+
+        return 0;
+}
+
 int main(int argc, char ** argv)
 {
         int ret = -1;
diff --git a/src/tools/echo/echo_client.c b/src/tools/echo/echo_client.c
deleted file mode 100644
index 4df5904d..00000000
--- a/src/tools/echo/echo_client.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * A simple echo application
- *
- *    Dimitri Staessens <dimitri.staessens@ugent.be>
- *    Sander Vrijders   <sander.vrijders@ugent.be>
- *
- * 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
- * published by the Free Software Foundation.
- *
- * 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., http://www.fsf.org/about/contact/.
- */
-
-#include <ouroboros/dev.h>
-#include <stdlib.h>
-
-int client_main(void)
-{
-        int fd = 0;
-        char buf[BUF_SIZE];
-        char * message  = "Client says hi!";
-        ssize_t count = 0;
-
-        fd = flow_alloc("echo", NULL, NULL);
-        if (fd < 0) {
-                printf("Failed to allocate flow.\n");
-                return -1;
-        }
-
-        if (flow_write(fd, message, strlen(message) + 1) < 0) {
-                printf("Failed to write SDU.\n");
-                flow_dealloc(fd);
-                return -1;
-        }
-
-        count = flow_read(fd, buf, BUF_SIZE);
-        if (count < 0) {
-                printf("Failed to read SDU.\n");
-                flow_dealloc(fd);
-                return -1;
-        }
-
-        printf("Server replied with %.*s\n", (int) count, buf);
-
-        flow_dealloc(fd);
-
-        return 0;
-}
diff --git a/src/tools/echo/echo_server.c b/src/tools/echo/echo_server.c
deleted file mode 100644
index 14e0aa58..00000000
--- a/src/tools/echo/echo_server.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * A simple echo application
- *
- *    Dimitri Staessens <dimitri.staessens@ugent.be>
- *    Sander Vrijders   <sander.vrijders@ugent.be>
- *
- * 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
- * published by the Free Software Foundation.
- *
- * 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., http://www.fsf.org/about/contact/.
- */
-
-#include <stdbool.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <ouroboros/dev.h>
-
-int server_main(void)
-{
-        int    fd = 0;
-        char   buf[BUF_SIZE];
-        ssize_t count = 0;
-        qosspec_t qs;
-
-        printf("Starting the server.\n");
-
-        while (true) {
-                fd = flow_accept(&qs, NULL);
-                if (fd < 0) {
-                        printf("Failed to accept flow.\n");
-                        break;
-                }
-
-                printf("New flow.\n");
-
-                count = flow_read(fd, &buf, BUF_SIZE);
-                if (count < 0) {
-                        printf("Failed to read SDU.\n");
-                        flow_dealloc(fd);
-                        continue;
-                }
-
-                printf("Message from client is %.*s.\n", (int) count, buf);
-
-                if (flow_write(fd, buf, count) == -1) {
-                        printf("Failed to write SDU.\n");
-                        flow_dealloc(fd);
-                        continue;
-                }
-
-                flow_dealloc(fd);
-        }
-
-        return 0;
-}