Merge pull request #857 from michael-loki/rcutil_curl

Add rpc call to get current addresses for our node

.travis.yml

@@ -133,13 +133,15 @@ addons:
     - gcc-mingw-w64-base
     - git
     - libcap-dev
+    - libcurl4-openssl-dev
     - libuv1-dev
     - mingw-w64 mingw-w64-common
     - ninja-build
   homebrew:
     packages:
     - ccache
     - cmake
+    - curl
     - libuv
     - llvm
     - make
@@ -148,7 +150,7 @@ addons:
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" == "windows" ]; then
-      choco install make ninja;
+      choco install curl make ninja;
       choco upgrade cmake.install;
       export CC="/c/Program Files/LLVM/bin/clang-cl";
       export CXX="/c/Program Files/LLVM/bin/clang-cl";

daemon/CMakeLists.txt

@@ -1,5 +1,7 @@
 set(EXE lokinet)
 set(EXE_SRC main.cpp)
+set(CTL lokinetctl)
+set(CTL_SRC lokinetctl.cpp)
 
 if(TRACY_ROOT)
     list(APPEND EXE_SRC ${TRACY_ROOT}/TracyClient.cpp)
@@ -12,22 +14,19 @@ if(SHADOW)
     target_link_libraries(${LOKINET_SHADOW} ${LOKINET_SHADOW_LIBS})
     target_include_directories(${LOKINET_SHADOW} PUBLIC ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/llarp ${PROJECT_SOURCE_DIR}/crypto/include)
 else()
-    if(NOT WIN32)
-        add_executable(${EXE} ${EXE_SRC})
-        add_executable(lokinet-rcutil rcutil.cpp)
-    elseif(NOT MSVC_VERSION)
-        add_executable(${EXE} ${EXE_SRC} llarp/win32/version.rc)
-        add_executable(lokinet-rcutil rcutil.cpp llarp/win32/version.rc)
-    else()
-        add_executable(${EXE} ${EXE_SRC})
-        add_executable(lokinet-rcutil rcutil.cpp)
-    endif(NOT WIN32)
+    if(WIN32 AND NOT MSVC_VERSION)
+        list(APPEND ${EXE_SRC} llarp/win32/version.rc)
+        list(APPEND ${CTL_SRC} llarp/win32/version.rc)
+    endif()
+
+    add_executable(${EXE} ${EXE_SRC})
+    add_executable(${CTL} ${CTL_SRC})
 
     add_log_tag(${EXE})
-    add_log_tag(lokinet-rcutil)
+    add_log_tag(${CTL})
 
     install(TARGETS ${EXE} RUNTIME DESTINATION bin)
-    install(TARGETS lokinet-rcutil RUNTIME DESTINATION bin)
+    install(TARGETS ${CTL} RUNTIME DESTINATION bin)
     if(WIN32)
         install(PROGRAMS ${CMAKE_SOURCE_DIR}/lokinet-bootstrap.exe DESTINATION bin)
     else()
@@ -38,8 +37,17 @@ else()
         install(CODE "execute_process(COMMAND setcap cap_net_admin,cap_net_bind_service=+eip ${CMAKE_INSTALL_PREFIX}/bin/lokinet)")
     elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
         target_link_directories(${EXE} PRIVATE /usr/local/lib)
-        target_link_directories(lokinet-rcutil PRIVATE /usr/local/lib)
+        target_link_directories(${CTL} PRIVATE /usr/local/lib)
     endif()
     target_link_libraries(${EXE} PUBLIC ${EXE_LIBS} ${LIBS})
-    target_link_libraries(lokinet-rcutil PUBLIC ${EXE_LIBS} ${LIBS})
+    target_link_libraries(${CTL} PUBLIC ${EXE_LIBS} ${LIBS})
+
+    find_package(CURL)
+
+    if(CURL_FOUND)
+        target_include_directories(${CTL} PRIVATE ${CURL_INCLUDE_DIRS})
+        target_link_libraries(${CTL} PRIVATE ${CURL_LIBRARIES})
+        target_compile_definitions(${CTL} PRIVATE -DWITH_CURL=1)
+    endif(CURL_FOUND)
+
 endif(SHADOW)