summaryrefslogtreecommitdiff
path: root/src/tools/echo
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri.staessens@ugent.be>2018-02-14 13:55:00 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2018-02-14 17:58:51 +0100
commit91012d9af758a48c4c57fc940dfcc8a581fa46ac (patch)
tree96495c10b615ddafa94ebcfa1a0977109ec0ffe8 /src/tools/echo
parente095d0ade3035c714768266755c9c61acfc2ad0f (diff)
downloadouroboros-91012d9af758a48c4c57fc940dfcc8a581fa46ac.tar.gz
ouroboros-91012d9af758a48c4c57fc940dfcc8a581fa46ac.zip
build: Allow out-of-tree build of tools
This removes the dependencies for the tools on some ouroboros internal headers (endian.h and time_utils.h) so they can be built out-of-tree. The echo-app tool has been renamed oecho and the cbr tool has been renamed ocbr. Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be> Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
Diffstat (limited to 'src/tools/echo')
-rw-r--r--src/tools/echo/CMakeLists.txt16
-rw-r--r--src/tools/echo/echo.c152
2 files changed, 0 insertions, 168 deletions
diff --git a/src/tools/echo/CMakeLists.txt b/src/tools/echo/CMakeLists.txt
deleted file mode 100644
index 4766ab84..00000000
--- a/src/tools/echo/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR}/include)
-
-set(SOURCE_FILES
- # Add source files here
- echo.c
- )
-
-add_executable(echo-app ${SOURCE_FILES})
-
-target_link_libraries(echo-app LINK_PUBLIC ouroboros-dev)
-
-install(TARGETS echo-app RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/echo/echo.c b/src/tools/echo/echo.c
deleted file mode 100644
index 3896a85a..00000000
--- a/src/tools/echo/echo.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2018
- *
- * A simple echo application
- *
- * Dimitri Staessens <dimitri.staessens@ugent.be>
- * Sander Vrijders <sander.vrijders@ugent.be>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define _POSIX_C_SOURCE 199309L
-
-#include <ouroboros/dev.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#define BUF_SIZE 256
-
-static void usage(void)
-{
- printf("Usage: echo-app [OPTION]...\n"
- "Sends an echo between a server and a client\n\n"
- " -l, --listen Run in server mode\n"
- " --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;
- bool server = false;
-
- argc--;
- argv++;
- while (argc > 0) {
- if (strcmp(*argv, "-l") == 0 ||
- strcmp(*argv, "--listen") == 0) {
- server = true;
- } else {
- usage();
- return 0;
- }
- argc--;
- argv++;
- }
-
- if (server)
- ret = server_main();
- else
- ret = client_main();
-
- return ret;
-}