diff options
| author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-04-13 10:18:08 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-04-13 10:18:08 +0000 |
| commit | df141f1ccff7edac4873845855d605ef70057fae (patch) | |
| tree | fb86f87679dda03cc53e06d9b0c6d3ee0ef26751 /src/tools | |
| parent | 72c28d6173ade511e9dc6969e0fc66db2dbba38a (diff) | |
| parent | 21187cdf04f6b6697064430aac68dcf795923943 (diff) | |
| download | ouroboros-df141f1ccff7edac4873845855d605ef70057fae.tar.gz ouroboros-df141f1ccff7edac4873845855d605ef70057fae.zip | |
Merged in dstaesse/ouroboros/be-ap_init (pull request #480)
include, lib: Rename ap_init/ap_fini
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/cbr/cbr.c | 6 | ||||
| -rw-r--r-- | src/tools/echo/echo.c | 6 | ||||
| -rw-r--r-- | src/tools/echo/echo_server.c | 2 | ||||
| -rw-r--r-- | src/tools/operf/operf.c | 6 | ||||
| -rw-r--r-- | src/tools/oping/oping.c | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/tools/cbr/cbr.c b/src/tools/cbr/cbr.c index cd29c9ad..597ae8a6 100644 --- a/src/tools/cbr/cbr.c +++ b/src/tools/cbr/cbr.c @@ -129,14 +129,14 @@ int main(int argc, char ** argv) } if (server) { - if (ap_init(argv_dup[0]) < 0) { + if (ouroboros_init(argv_dup[0]) < 0) { printf("Failed to init.\n"); exit(EXIT_FAILURE); } ret = server_main(); } else { - if (ap_init(NULL) < 0) { + if (ouroboros_init(NULL) < 0) { printf("Failed to init.\n"); exit(EXIT_FAILURE); } @@ -150,7 +150,7 @@ int main(int argc, char ** argv) ret = client_main(s_apn, duration, size, rate, flood, sleep); } - ap_fini(); + ouroboros_fini(); return ret; } diff --git a/src/tools/echo/echo.c b/src/tools/echo/echo.c index 051a16c3..b68e8c02 100644 --- a/src/tools/echo/echo.c +++ b/src/tools/echo/echo.c @@ -59,20 +59,20 @@ int main(int argc, char ** argv) } if (server) { - if (ap_init(argv_dup[0])) { + if (ouroboros_init(argv_dup[0])) { printf("Failed to init AP.\n"); return -1; } ret = server_main(); } else { - if (ap_init(NULL)) { + if (ouroboros_init(NULL)) { printf("Failed to init AP.\n"); return -1; } ret = client_main(); } - ap_fini(); + ouroboros_fini(); return ret; } diff --git a/src/tools/echo/echo_server.c b/src/tools/echo/echo_server.c index 771155f4..22175a65 100644 --- a/src/tools/echo/echo_server.c +++ b/src/tools/echo/echo_server.c @@ -31,7 +31,7 @@ void shutdown_server(int signo) { (void) signo; - ap_fini(); + ouroboros_fini(); exit(EXIT_SUCCESS); } diff --git a/src/tools/operf/operf.c b/src/tools/operf/operf.c index 7935d12c..5e7f2f37 100644 --- a/src/tools/operf/operf.c +++ b/src/tools/operf/operf.c @@ -140,14 +140,14 @@ int main(int argc, char ** argv) } if (serv) { - if (ap_init(argv_dup[0])) { + if (ouroboros_init(argv_dup[0])) { printf("Failed to init AP.\n"); exit(EXIT_FAILURE); } ret = server_main(); } else { - if (ap_init(NULL)) { + if (ouroboros_init(NULL)) { printf("Failed to init AP.\n"); exit(EXIT_FAILURE); } @@ -171,7 +171,7 @@ int main(int argc, char ** argv) ret = client_main(); } - ap_fini(); + ouroboros_fini(); if (ret < 0) exit(EXIT_FAILURE); diff --git a/src/tools/oping/oping.c b/src/tools/oping/oping.c index 7c9c108c..a88e06e5 100644 --- a/src/tools/oping/oping.c +++ b/src/tools/oping/oping.c @@ -139,14 +139,14 @@ int main(int argc, char ** argv) } if (serv) { - if (ap_init(argv_dup[0])) { + if (ouroboros_init(argv_dup[0])) { printf("Failed to init AP.\n"); exit(EXIT_FAILURE); } ret = server_main(); } else { - if (ap_init(NULL)) { + if (ouroboros_init(NULL)) { printf("Failed to init AP.\n"); exit(EXIT_FAILURE); } @@ -179,7 +179,7 @@ int main(int argc, char ** argv) ret = client_main(); } - ap_fini(); + ouroboros_fini(); if (ret < 0) exit(EXIT_FAILURE); |