summaryrefslogtreecommitdiff
path: root/src/tools/echo
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-03-24 19:52:01 +0100
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-03-24 19:52:01 +0100
commit545092a8eaa1a972a2bcaf1b532d74f21db1b623 (patch)
treebecb621b18a37626728378576ffae4dd58b5290a /src/tools/echo
parentdd30bcdb1d440d812b47c0b998c8f120b271ea9b (diff)
parentc32ccc39cfc793729890204c8d810eb7608f4474 (diff)
downloadouroboros-545092a8eaa1a972a2bcaf1b532d74f21db1b623.tar.gz
ouroboros-545092a8eaa1a972a2bcaf1b532d74f21db1b623.zip
Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-shm
Diffstat (limited to 'src/tools/echo')
-rw-r--r--src/tools/echo/echo_client.c5
-rw-r--r--src/tools/echo/echo_server.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/tools/echo/echo_client.c b/src/tools/echo/echo_client.c
index 2f80a52a..196296f2 100644
--- a/src/tools/echo/echo_client.c
+++ b/src/tools/echo/echo_client.c
@@ -33,9 +33,8 @@ int client_main()
char * message = "Client says hi!";
ssize_t count = 0;
- fd = flow_alloc(SERVER_AP_NAME, NULL,
- CLIENT_AP_NAME, NULL,
- NULL, 0);
+ fd = flow_alloc(SERVER_AP_NAME, CLIENT_AP_NAME,
+ NULL, NULL, 0);
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 f9682ab7..289f537a 100644
--- a/src/tools/echo/echo_server.c
+++ b/src/tools/echo/echo_server.c
@@ -34,7 +34,7 @@ void shutdown_server(int signo)
{
char * dif = DIF_NAME;
- if (ap_unreg(SERVER_AP_NAME, NULL, &dif, 1)) {
+ if (ap_unreg(SERVER_AP_NAME, &dif, 1)) {
printf("Failed to unregister application\n");
exit(EXIT_FAILURE);
}
@@ -59,7 +59,7 @@ int server_main()
return -1;
}
- server_fd = ap_reg(SERVER_AP_NAME, NULL, &dif, 1);
+ server_fd = ap_reg(SERVER_AP_NAME, &dif, 1);
if (server_fd < 0) {
printf("Failed to register application\n");
return -1;