Merge pull request #1643 from majestrate/win32-rpc-fixups-2021-05-13

win32 fixups

cmake/win32_installer_deps.cmake

@@ -26,7 +26,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf ${CMAKE_BINARY_DIR}/lokinet-g
 
 install(DIRECTORY ${CMAKE_BINARY_DIR}/gui DESTINATION share COMPONENT gui)
 install(PROGRAMS ${TUNTAP_EXE} DESTINATION bin COMPONENT tuntap)
-install(FILES ${BOOTSTRAP_FILE} DESTINATION share)
+install(FILES ${BOOTSTRAP_FILE} DESTINATION share COMPONENT lokinet)
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Lokinet")
 set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/win32-setup/lokinet.ico")
@@ -40,3 +40,6 @@ set(CPACK_NSIS_CREATE_ICONS_EXTRA
 set(CPACK_NSIS_DELETE_ICONS_EXTRA
     "Delete '$SMPROGRAMS\\\\$START_MENU\\\\Lokinet.lnk'"
 )
+
+get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)
+list(REMOVE_ITEM CPACK_COMPONENTS_ALL "Unspecified")

contrib/windows.sh

@@ -12,6 +12,7 @@ cmake \
       -DBUILD_PACKAGE=ON \
       -DBUILD_SHARED_LIBS=OFF \
       -DBUILD_TESTING=OFF \
+      -DBUILD_LIBLOKINET=ON \
       -DWITH_TESTS=OFF \
       -DNATIVE_BUILD=OFF \
       -DSTATIC_LINK=ON \

llarp/CMakeLists.txt

@@ -249,12 +249,16 @@ if(BUILD_LIBLOKINET)
   include(GNUInstallDirs)
   add_library(lokinet-shared SHARED lokinet_shared.cpp)
   target_link_libraries(lokinet-shared PUBLIC liblokinet)
-  install(TARGETS lokinet-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
   if(WIN32)
     set(CMAKE_SHARED_LIBRARY_PREFIX_CXX "")
-    target_link_libraries(lokinet-shared PUBLIC ws2_32 iphlpapi -fstack-protector)
   endif()
   set_target_properties(lokinet-shared PROPERTIES OUTPUT_NAME lokinet)
+  if(WIN32)
+    target_link_libraries(lokinet-shared PUBLIC ws2_32 iphlpapi -fstack-protector)
+    install(TARGETS lokinet-shared DESTINATION bin COMPONENT liblokinet)
+  else()
+    install(TARGETS lokinet-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT liblokinet)
+  endif()
   add_log_tag(lokinet-shared)
 endif()
 

llarp/router/abstractrouter.hpp

@@ -292,6 +292,13 @@ namespace llarp
     virtual bool
     ConnectionToRouterAllowed(const RouterID& router) const = 0;
 
+    /// return true if we have an exit as a client
+    virtual bool
+    HasClientExit() const
+    {
+      return false;
+    };
+
     virtual path::BuildLimiter&
     pathBuildLimiter() = 0;
 

llarp/router/router.hpp

@@ -402,7 +402,7 @@ namespace llarp
 
     /// return true if we are a client with an exit configured
     bool
-    HasClientExit() const;
+    HasClientExit() const override;
 
     const byte_t*
     pubkey() const override

llarp/rpc/rpc_server.cpp

@@ -402,7 +402,7 @@ namespace llarp::rpc
                 {
                   service::Address addr;
                   const auto exit_str = exit_itr->get<std::string>();
-                  if (service::NameIsValid(exit_str))
+                  if (service::NameIsValid(exit_str) or exit_str == "null")
                   {
                     lnsExit = exit_str;
                   }
@@ -456,39 +456,54 @@ namespace llarp::rpc
                   {
                     auto mapExit = [=](service::Address addr) mutable {
                       ep->MapExitRange(range, addr);
+                      r->routePoker().Enable();
+                      r->routePoker().Up();
                       bool shouldSendAuth = false;
                       if (token.has_value())
                       {
                         shouldSendAuth = true;
                         ep->SetAuthInfoForEndpoint(*exit, service::AuthInfo{*token});
                       }
+                      auto onGoodResult = [r, reply](std::string reason) {
+                        if (r->HasClientExit())
+                          reply(CreateJSONResponse(reason));
+                        else
+                          reply(CreateJSONError("we dont have an exit?"));
+                      };
+                      auto onBadResult = [r, reply, ep, range](std::string reason) {
+                        r->routePoker().Down();
+                        ep->UnmapExitRange(range);
+                        reply(CreateJSONError(reason));
+                      };
+                      if (addr.IsZero())
+                      {
+                        onGoodResult("added null exit");
+                        return;
+                      }
                       ep->EnsurePathToService(
                           addr,
-                          [reply, r, shouldSendAuth](auto, service::OutboundContext* ctx) {
+                          [onBadResult, onGoodResult, shouldSendAuth, addrStr = addr.ToString()](
+                              auto, service::OutboundContext* ctx) {
                             if (ctx == nullptr)
                             {
-                              reply(CreateJSONError("could not find exit"));
+                              onBadResult("could not find exit");
                               return;
                             }
-                            auto onGoodResult = [r, reply](std::string reason) {
-                              r->routePoker().Enable();
-                              r->routePoker().Up();
-                              reply(CreateJSONResponse(reason));
-                            };
                             if (not shouldSendAuth)
                             {
-                              onGoodResult("OK");
+                              onGoodResult("OK: connected to " + addrStr);
                               return;
                             }
-                            ctx->AsyncSendAuth([onGoodResult, reply](service::AuthResult result) {
-                              // TODO: refactor this code.  We are 5 lambdas deep here!
-                              if (result.code != service::AuthResultCode::eAuthAccepted)
-                              {
-                                reply(CreateJSONError(result.reason));
-                                return;
-                              }
-                              onGoodResult(result.reason);
-                            });
+                            ctx->AsyncSendAuth(
+                                [onGoodResult, onBadResult](service::AuthResult result) {
+                                  // TODO: refactor this code.  We are 5 lambdas deep here!
+                                  if (result.code != service::AuthResultCode::eAuthAccepted)
+                                  {
+                                    onBadResult(result.reason);
+                                    return;
+                                  }
+                                  onGoodResult(result.reason);
+                                });
                           },
                           5s);
                     };
@@ -521,7 +536,6 @@ namespace llarp::rpc
                         else
                         {
                           reply(CreateJSONError("lns name resolved to a snode"));
-                          return;
                         }
                       });
                     }