Merged in dstaesse/ouroboros/be-deprecate-ouroboros-init-fini (pull request #626)

Be deprecate ouroboros init fini

2 files changed, 1 insertions, 14 deletions

diff --git a/src/tools/oping/CMakeLists.txt b/src/tools/oping/CMakeLists.txt
index b95add7e..d3146780 100644
--- a/src/tools/oping/CMakeLists.txt
+++ b/src/tools/oping/CMakeLists.txt
@@ -18,6 +18,6 @@ set(SOURCE_FILES
 
 add_executable(oping ${SOURCE_FILES})
 
-target_link_libraries(oping LINK_PUBLIC ${LIBM_LIBRARIES} ouroboros)
+target_link_libraries(oping LINK_PUBLIC ${LIBM_LIBRARIES} ouroboros-dev)
 
 install(TARGETS oping RUNTIME DESTINATION usr/bin)
diff --git a/src/tools/oping/oping.c b/src/tools/oping/oping.c
index bca4f80b..a76f0fec 100644
--- a/src/tools/oping/oping.c
+++ b/src/tools/oping/oping.c
@@ -101,7 +101,6 @@ int main(int argc, char ** argv)
         int ret = -1;
         char * rem = NULL;
         bool serv = false;
-        char ** argv_dup = argv;
 
         argc--;
         argv++;
@@ -140,18 +139,8 @@ int main(int argc, char ** argv)
         }
 
         if (serv) {
-                if (ouroboros_init(argv_dup[0])) {
-                        printf("Failed to init AP.\n");
-                        exit(EXIT_FAILURE);
-                }
-
                 ret = server_main();
         } else {
-                if (ouroboros_init(NULL)) {
-                        printf("Failed to init AP.\n");
-                        exit(EXIT_FAILURE);
-                }
-
                 if (client.s_apn == NULL) {
                         printf("No server specified.\n");
                         usage();
@@ -180,8 +169,6 @@ int main(int argc, char ** argv)
                 ret = client_main();
         }
 
-        ouroboros_fini();
-
         if (ret < 0)
                 exit(EXIT_FAILURE);