summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-05-10 11:32:51 +0200
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-05-10 11:32:51 +0200
commitf3b9cc299d729f21d34ed5a7c6b8d06f7b50020e (patch)
tree25d958bf643003530e7509ec470ef52ae921ddfa
parent22a36acfb535cd35250eb3b77bdbf75ff161217d (diff)
parenta952b77225418ce0e92f14e58f2db792ce9a72b0 (diff)
downloadouroboros-f3b9cc299d729f21d34ed5a7c6b8d06f7b50020e.tar.gz
ouroboros-f3b9cc299d729f21d34ed5a7c6b8d06f7b50020e.zip
Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into irmd-threads
-rw-r--r--src/tools/echo/echo_client.c12
-rw-r--r--src/tools/echo/echo_server.c4
-rw-r--r--src/tools/irm/irm_bootstrap_ipcp.c2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/tools/echo/echo_client.c b/src/tools/echo/echo_client.c
index 9cf56cee..5c613817 100644
--- a/src/tools/echo/echo_client.c
+++ b/src/tools/echo/echo_client.c
@@ -33,28 +33,28 @@ int client_main()
char * message = "Client says hi!";
ssize_t count = 0;
- if(ap_init(CLIENT_AP_NAME)) {
- printf("Failed to init AP.");
+ if (ap_init(CLIENT_AP_NAME)) {
+ printf("Failed to init AP.\n");
return -1;
}
fd = flow_alloc(SERVER_AP_NAME, NULL, NULL);
if (fd < 0) {
- printf("Failed to allocate flow\n");
+ printf("Failed to allocate flow.\n");
ap_fini();
return -1;
}
result = flow_alloc_res(fd);
if (result < 0) {
- printf("Flow allocation refused\n");
+ printf("Flow allocation refused.\n");
flow_dealloc(fd);
ap_fini();
return -1;
}
if (flow_write(fd, message, strlen(message) + 1) == -1) {
- printf("Failed to write SDU\n");
+ printf("Failed to write SDU.\n");
flow_dealloc(fd);
ap_fini();
return -1;
@@ -62,7 +62,7 @@ int client_main()
count = flow_read(fd, buf, BUF_SIZE);
if (count < 0) {
- printf("Failed to read SDU\n");
+ printf("Failed to read SDU.\n");
flow_dealloc(fd);
ap_fini();
return -1;
diff --git a/src/tools/echo/echo_server.c b/src/tools/echo/echo_server.c
index d9af1c1f..b72da319 100644
--- a/src/tools/echo/echo_server.c
+++ b/src/tools/echo/echo_server.c
@@ -60,8 +60,8 @@ int server_main()
return -1;
}
- if(ap_init(SERVER_AP_NAME)) {
- printf("Failed to init AP.");
+ if (ap_init(SERVER_AP_NAME)) {
+ printf("Failed to init AP.\n");
return -1;
}
diff --git a/src/tools/irm/irm_bootstrap_ipcp.c b/src/tools/irm/irm_bootstrap_ipcp.c
index b90e934f..64498384 100644
--- a/src/tools/irm/irm_bootstrap_ipcp.c
+++ b/src/tools/irm/irm_bootstrap_ipcp.c
@@ -132,7 +132,7 @@ int do_bootstrap_ipcp(int argc, char ** argv)
max_pdu_size = atoi(*(argv + 1));
} else {
printf("\"%s\" is unknown, try \"irm "
- "destroy_ipcp\".\n", *argv);
+ "bootstrap_ipcp\".\n", *argv);
return -1;
}