Archives
/
lokinet
mirror of https://github.com/oxen-io/lokinet
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace cxxopts with CLI11

Browse Source 
- Simiplifies CLI code for future modification
- filesystem library linked in cmake check_for_std_filesystem file
pull/2107/head
dan 1 year ago
parent bf0dc52df7
commit dc7f3cee22
10 changed files with 634 additions and 617 deletions
Show Stats Download Patch File Download Diff File

6
.gitmodules vendored
Unescape Escape View File

@ -1,9 +1,6 @@
[submodule "external/nlohmann"]
path = external/nlohmann
url = https://github.com/nlohmann/json.git
[submodule "external/cxxopts"]
path = external/cxxopts
url = https://github.com/jarro2783/cxxopts.git
[submodule "external/ghc-filesystem"]
path = external/ghc-filesystem
url = https://github.com/gulrak/filesystem.git
@ -39,3 +36,6 @@
[submodule "gui"]
path = gui
url = https://github.com/oxen-io/lokinet-gui.git
[submodule "external/CLI11"]
path = external/CLI11
url = https://github.com/CLIUtils/CLI11.git

2
cmake/check_for_std_filesystem.cmake
Unescape Escape View File

@ -47,5 +47,5 @@ else()
set(GHC_FILESYSTEM_WITH_INSTALL OFF CACHE INTERNAL "")
add_subdirectory(external/ghc-filesystem)
target_link_libraries(filesystem INTERFACE ghc_filesystem)
target_compile_definitions(filesystem INTERFACE USE_GHC_FILESYSTEM)
target_compile_definitions(filesystem INTERFACE USE_GHC_FILESYSTEM CLI11_HAS_FILESYSTEM=0)
endif()

185
daemon/lokinet-vpn.cpp
Unescape Escape View File

@ -1,12 +1,15 @@
#include <oxenmq/oxenmq.h>
#include <nlohmann/json.hpp>
#include <fmt/core.h>
#include <cxxopts.hpp>
#include <future>
#include <vector>
#include <array>
#include <llarp/net/net.hpp>
#include <CLI/App.hpp>
#include <CLI/Formatter.hpp>
#include <CLI/Config.hpp>
#ifdef _WIN32
// add the unholy windows headers for iphlpapi
#include <winsock2.h>
@ -53,25 +56,28 @@ OMQ_Request(
namespace
{
template <typename T>
constexpr bool is_optional = false;
template <typename T>
constexpr bool is_optional<std::optional<T>> = true;
// Extracts a value from a cxxopts result and assigns it into `value` if present. The value can
// either be a plain value or a std::optional. If not present, `value` is not touched.
template <typename T>
void
extract_option(const cxxopts::ParseResult& r, const std::string& name, T& value)
{
if (r.count(name))
struct command_line_options
{
if constexpr (is_optional<T>)
value = r[name].as<typename T::value_type>();
else
value = r[name].as<T>();
}
}
// bool options
bool verbose = false;
bool help = false;
bool vpnUp = false;
bool vpnDown = false;
bool printStatus = false;
bool killDaemon = false;
// string options
std::string exitAddress;
std::string rpc;
std::string endpoint = "default";
std::string token;
std::optional<std::string> range;
// oxenmq
oxenmq::address rpcURL{"tcp://127.0.0.1:1190"};
oxenmq::LogLevel logLevel = oxenmq::LogLevel::warn;
};
// Takes a code, prints a message, and returns the code. Intended use is:
// return exit_error(1, "blah: {}", 42);
@ -98,119 +104,104 @@ namespace
int
main(int argc, char* argv[])
{
cxxopts::Options opts("lokinet-vpn", "LokiNET vpn control utility");
// clang-format off
opts.add_options()
("v,verbose", "Verbose", cxxopts::value<bool>())
("h,help", "help", cxxopts::value<bool>())
("kill", "kill the daemon", cxxopts::value<bool>())
("up", "put vpn up", cxxopts::value<bool>())
("down", "put vpn down", cxxopts::value<bool>())
("exit", "specify exit node address", cxxopts::value<std::string>())
("rpc", "rpc url for lokinet", cxxopts::value<std::string>())
("endpoint", "endpoint to use", cxxopts::value<std::string>())
("token", "exit auth token to use", cxxopts::value<std::string>())
("auth", "exit auth token to use", cxxopts::value<std::string>())
("status", "print status and exit", cxxopts::value<bool>())
("range", "ip range to map", cxxopts::value<std::string>())
;
// clang-format on
oxenmq::address rpcURL("tcp://127.0.0.1:1190");
std::string exitAddress;
std::string endpoint = "default";
std::string token;
std::optional<std::string> range;
oxenmq::LogLevel logLevel = oxenmq::LogLevel::warn;
bool goUp = false;
bool goDown = false;
bool printStatus = false;
bool killDaemon = false;
CLI::App cli{"lokiNET vpn control utility", "lokinet-vpn"};
command_line_options options{};
// flags: boolean values in command_line_options struct
cli.add_flag("v,--verbose", options.verbose, "Verbose");
cli.add_flag("--up", options.vpnUp, "Put VPN up");
cli.add_flag("--down", options.vpnDown, "Put VPN down");
cli.add_flag("--status", options.printStatus, "Print VPN status and exit");
cli.add_flag("k,--kill", options.killDaemon, "Kill lokinet daemon");
// options: string values in command_line_options struct
cli.add_option("--exit", options.exitAddress, "Specify exit node address")->capture_default_str();
cli.add_option("--endpoint", options.endpoint, "Endpoint to use")->capture_default_str();
cli.add_option("--token", options.token, "Exit auth token to use")->capture_default_str();
// options: oxenmq values in command_line_options struct
cli.add_option("--rpc", options.rpc, "Specify RPC URL for lokinet")->capture_default_str();
cli.add_option(
"--log-level", options.logLevel, "Log verbosity level, see log levels for accepted values")
->type_name("LEVEL")
->capture_default_str();
try
{
const auto result = opts.parse(argc, argv);
if (result.count("help") > 0)
cli.parse(argc, argv);
}
catch (const CLI::ParseError& e)
{
std::cout << opts.help() << std::endl;
return 0;
return cli.exit(e);
}
if (result.count("verbose") > 0)
try
{
logLevel = oxenmq::LogLevel::debug;
}
goUp = result.count("up") > 0;
goDown = result.count("down") > 0;
printStatus = result.count("status") > 0;
killDaemon = result.count("kill") > 0;
extract_option(result, "rpc", rpcURL);
extract_option(result, "exit", exitAddress);
extract_option(result, "endpoint", endpoint);
extract_option(result, "token", token);
extract_option(result, "auth", token);
extract_option(result, "range", range);
if (options.verbose)
options.logLevel = oxenmq::LogLevel::debug;
}
catch (const cxxopts::option_not_exists_exception& ex)
catch (const CLI::OptionNotFound& e)
{
return exit_error(2, "{}\n{}", ex.what(), opts.help());
cli.exit(e);
}
catch (std::exception& ex)
catch (const CLI::Error& e)
{
return exit_error(2, "{}", ex.what());
}
cli.exit(e);
};
int num_commands = goUp + goDown + printStatus + killDaemon;
int numCommands = options.vpnUp + options.vpnDown + options.printStatus + options.killDaemon;
if (num_commands == 0)
switch (numCommands)
{
case 0:
return exit_error(3, "One of --up/--down/--status/--kill must be specified");
if (num_commands != 1)
case 1:
return exit_error(3, "Only one of --up/--down/--status/--kill may be specified");
default:
break;
}
if (goUp and exitAddress.empty())
return exit_error("no exit address provided");
if (options.vpnUp and options.exitAddress.empty())
return exit_error("No exit address provided, must specify --exit <address>");
oxenmq::OxenMQ omq{
[](oxenmq::LogLevel lvl, const char* file, int line, std::string msg) {
std::cout << lvl << " [" << file << ":" << line << "] " << msg << std::endl;
},
logLevel};
options.logLevel};
omq.start();
std::promise<bool> connectPromise;
const auto connID = omq.connect_remote(
rpcURL,
const auto connectionID = omq.connect_remote(
options.rpc,
[&connectPromise](auto) { connectPromise.set_value(true); },
[&connectPromise](auto, std::string_view msg) {
std::cout << "failed to connect to lokinet RPC: " << msg << std::endl;
std::cout << "Failed to connect to lokinet RPC: " << msg << std::endl;
connectPromise.set_value(false);
});
auto ftr = connectPromise.get_future();
if (not ftr.get())
{
return 1;
}
if (killDaemon)
if (options.killDaemon)
{
if (not OMQ_Request(omq, connID, "llarp.halt"))
return exit_error("call to llarp.halt failed");
if (not OMQ_Request(omq, connectionID, "llarp.halt"))
return exit_error("Call to llarp.halt failed");
return 0;
}
if (printStatus)
if (options.printStatus)
{
const auto maybe_status = OMQ_Request(omq, connID, "llarp.status");
const auto maybe_status = OMQ_Request(omq, connectionID, "llarp.status");
if (not maybe_status)
return exit_error("call to llarp.status failed");
try
{
const auto& ep = maybe_status->at("result").at("services").at(endpoint);
const auto& ep = maybe_status->at("result").at("services").at(options.endpoint);
const auto exitMap = ep.at("exitMap");
if (exitMap.empty())
{
@ -230,13 +221,13 @@ main(int argc, char* argv[])
}
return 0;
}
if (goUp)
if (options.vpnUp)
{
nlohmann::json opts{{"exit", exitAddress}, {"token", token}};
if (range)
opts["range"] = *range;
nlohmann::json opts{{"exit", options.exitAddress}, {"token", options.token}};
if (options.range)
opts["range"] = *options.range;
auto maybe_result = OMQ_Request(omq, connID, "llarp.exit", std::move(opts));
auto maybe_result = OMQ_Request(omq, connectionID, "llarp.exit", std::move(opts));
if (not maybe_result)
return exit_error("could not add exit");
@ -247,12 +238,12 @@ main(int argc, char* argv[])
return exit_error("{}", err_it.value());
}
}
if (goDown)
if (options.vpnDown)
{
nlohmann::json opts{{"unmap", true}};
if (range)
opts["range"] = *range;
if (not OMQ_Request(omq, connID, "llarp.exit", std::move(opts)))
if (options.range)
opts["range"] = *options.range;
if (not OMQ_Request(omq, connectionID, "llarp.exit", std::move(opts)))
return exit_error("failed to unmap exit");
}

531
daemon/lokinet.cpp
Unescape Escape View File

@ -15,43 +15,88 @@
#include <csignal>
#include <cxxopts.hpp>
#include <string>
#include <iostream>
#include <thread>
#include <future>
int
lokinet_main(int, char**);
#include <CLI/App.hpp>
#include <CLI/Formatter.hpp>
#include <CLI/Config.hpp>
#ifdef _WIN32
extern "C" LONG FAR PASCAL
win32_signal_handler(EXCEPTION_POINTERS*);
extern "C" VOID FAR PASCAL
win32_daemon_entry(DWORD, LPTSTR*);
namespace
{
struct command_line_options
{
// bool options
bool help = false;
bool version = false;
bool generate = false;
bool router = false;
bool force = false;
bool configOnly = false;
bool overwrite = false;
VOID
insert_description();
// string options
std::string configPath;
#endif
// windows options
bool win_install = false;
bool win_remove = false;
};
static auto logcat = llarp::log::Cat("main");
std::shared_ptr<llarp::Context> ctx;
std::promise<int> exit_code;
// windows-specific function declarations
int
startWinsock();
void
install_win32_daemon();
void
uninstall_win32_daemon();
void
handle_signal(int sig)
{
// operational function definitions
int
lokinet_main(int, char**);
void
handle_signal(int sig);
static void
run_main_context(std::optional<fs::path> confFile, const llarp::RuntimeOptions opts);
// variable declarations
static auto logcat = llarp::log::Cat("main");
std::shared_ptr<llarp::Context> ctx;
std::promise<int> exit_code;
// operational function definitions
void
handle_signal(int sig)
{
llarp::log::info(logcat, "Handling signal {}", sig);
if (ctx)
ctx->loop->call([sig] { ctx->HandleSignal(sig); });
else
std::cerr << "Received signal " << sig << ", but have no context yet. Ignoring!" << std::endl;
}
}
// Windows specific code
#ifdef _WIN32
int
startWinsock()
{
extern "C" LONG FAR PASCAL
win32_signal_handler(EXCEPTION_POINTERS*);
extern "C" VOID FAR PASCAL
win32_daemon_entry(DWORD, LPTSTR*);
VOID
insert_description();
extern "C" BOOL FAR PASCAL
handle_signal_win32(DWORD fdwCtrlType)
{
UNREFERENCED_PARAMETER(fdwCtrlType);
handle_signal(SIGINT);
return TRUE; // probably unreachable
};
int
startWinsock()
{
WSADATA wsockd;
int err;
err = ::WSAStartup(MAKEWORD(2, 2), &wsockd);
@ -62,19 +107,11 @@ startWinsock()
}
::CreateMutex(nullptr, FALSE, "lokinet_win32_daemon");
return 0;
}
extern "C" BOOL FAR PASCAL
handle_signal_win32(DWORD fdwCtrlType)
{
UNREFERENCED_PARAMETER(fdwCtrlType);
handle_signal(SIGINT);
return TRUE; // probably unreachable
}
}
void
install_win32_daemon()
{
void
install_win32_daemon()
{
SC_HANDLE schSCManager;
SC_HANDLE schService;
std::array<char, 1024> szPath{};
@ -125,11 +162,11 @@ install_win32_daemon()
CloseServiceHandle(schService);
CloseServiceHandle(schSCManager);
insert_description();
}
}
VOID
insert_description()
{
VOID
insert_description()
{
SC_HANDLE schSCManager;
SC_HANDLE schService;
SERVICE_DESCRIPTION sd;
@ -177,11 +214,11 @@ insert_description()
CloseServiceHandle(schService);
CloseServiceHandle(schSCManager);
}
}
void
uninstall_win32_daemon()
{
void
uninstall_win32_daemon()
{
SC_HANDLE schSCManager;
SC_HANDLE schService;
@ -220,83 +257,13 @@ uninstall_win32_daemon()
CloseServiceHandle(schService);
CloseServiceHandle(schSCManager);
}
#endif
/// this sets up, configures and runs the main context
static void
run_main_context(std::optional<fs::path> confFile, const llarp::RuntimeOptions opts)
{
llarp::LogInfo(fmt::format("starting up {} {}", llarp::VERSION_FULL, llarp::RELEASE_MOTTO));
try
{
std::shared_ptr<llarp::Config> conf;
if (confFile)
{
llarp::LogInfo("Using config file: ", *confFile);
conf = std::make_shared<llarp::Config>(confFile->parent_path());
}
else
{
conf = std::make_shared<llarp::Config>(llarp::GetDefaultDataDir());
}
if (not conf->Load(confFile, opts.isSNode))
{
llarp::LogError("failed to parse configuration");
exit_code.set_value(1);
return;
}
ctx = std::make_shared<llarp::Context>();
ctx->Configure(std::move(conf));
signal(SIGINT, handle_signal);
signal(SIGTERM, handle_signal);
#ifndef _WIN32
signal(SIGHUP, handle_signal);
signal(SIGUSR1, handle_signal);
#endif
try
{
ctx->Setup(opts);
}
catch (llarp::util::bind_socket_error& ex)
{
llarp::LogError(fmt::format("{}, is lokinet already running? 🤔", ex.what()));
exit_code.set_value(1);
return;
}
catch (std::exception& ex)
{
llarp::LogError(fmt::format("failed to start up lokinet: {}", ex.what()));
exit_code.set_value(1);
return;
}
llarp::util::SetThreadName("llarp-mainloop");
auto result = ctx->Run(opts);
exit_code.set_value(result);
}
catch (std::exception& e)
{
llarp::LogError("Fatal: caught exception while running: ", e.what());
exit_code.set_exception(std::current_exception());
}
catch (...)
/// minidump generation for windows jizz
/// will make a coredump when there is an unhandled exception
LONG
GenerateDump(EXCEPTION_POINTERS* pExceptionPointers)
{
llarp::LogError("Fatal: caught non-standard exception while running");
exit_code.set_exception(std::current_exception());
}
}
#ifdef _WIN32
/// minidump generation for windows jizz
/// will make a coredump when there is an unhandled exception
LONG
GenerateDump(EXCEPTION_POINTERS* pExceptionPointers)
{
const auto flags =
(MINIDUMP_TYPE)(MiniDumpWithFullMemory | MiniDumpWithFullMemoryInfo | MiniDumpWithHandleData | MiniDumpWithUnloadedModules | MiniDumpWithThreadInfo);
@ -324,52 +291,63 @@ GenerateDump(EXCEPTION_POINTERS* pExceptionPointers)
GetCurrentProcess(), GetCurrentProcessId(), hDumpFile, flags, &ExpParam, NULL, NULL);
return 1;
}
#endif
}
int
main(int argc, char* argv[])
{
// Set up a default, stderr logging for very early logging; we'll replace this later once we read
// the desired log info from config.
llarp::log::add_sink(llarp::log::Type::Print, "stderr");
llarp::log::reset_level(llarp::log::Level::info);
VOID FAR PASCAL
SvcCtrlHandler(DWORD dwCtrl)
{
// Handle the requested control code.
llarp::logRingBuffer = std::make_shared<llarp::log::RingBufferSink>(100);
llarp::log::add_sink(llarp::logRingBuffer, llarp::log::DEFAULT_PATTERN_MONO);
switch (dwCtrl)
{
case SERVICE_CONTROL_STOP:
// tell service we are stopping
llarp::log::debug(logcat, "Windows service controller gave SERVICE_CONTROL_STOP");
llarp::sys::service_manager->system_changed_our_state(llarp::sys::ServiceState::Stopping);
handle_signal(SIGINT);
return;
#ifndef _WIN32
return lokinet_main(argc, argv);
#else
SERVICE_TABLE_ENTRY DispatchTable[] = {
{strdup("lokinet"), (LPSERVICE_MAIN_FUNCTION)win32_daemon_entry}, {NULL, NULL}};
case SERVICE_CONTROL_INTERROGATE:
// report status
llarp::log::debug(logcat, "Got win32 service interrogate signal");
llarp::sys::service_manager->report_changed_state();
return;
// Try first to run as a service; if this works it fires off to win32_daemon_entry and doesn't
// return until the service enters STOPPED state.
if (StartServiceCtrlDispatcher(DispatchTable))
return 0;
default:
llarp::log::debug(logcat, "Got win32 unhandled signal {}", dwCtrl);
break;
}
}
auto error = GetLastError();
// The win32 daemon entry point is where we go when invoked as a windows service; we do the
// required service dance and then pretend we were invoked via main().
VOID FAR PASCAL
win32_daemon_entry(DWORD, LPTSTR* argv)
{
// Register the handler function for the service
auto* svc = dynamic_cast<llarp::sys::SVC_Manager*>(llarp::sys::service_manager);
svc->handle = RegisterServiceCtrlHandler("lokinet", SvcCtrlHandler);
// We'll get this error if not invoked as a service, which is fine: we can just run directly
if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT)
if (svc->handle == nullptr)
{
llarp::sys::service_manager->disable();
return lokinet_main(argc, argv);
llarp::LogError("failed to register daemon control handler");
return;
}
else
{
llarp::log::critical(
logcat, "Error launching service: {}", std::system_category().message(error));
return 1;
// we hard code the args to lokinet_main.
// we yoink argv[0] (lokinet.exe path) and pass in the new args.
std::array args = {
reinterpret_cast<char*>(argv[0]),
reinterpret_cast<char*>(strdup("c:\\programdata\\lokinet\\lokinet.ini")),
reinterpret_cast<char*>(0)};
lokinet_main(args.size() - 1, args.data());
}
#endif
}
int
lokinet_main(int argc, char** argv)
{
int
lokinet_main(int argc, char** argv)
{
if (auto result = Lokinet_INIT())
return result;
@ -382,98 +360,86 @@ lokinet_main(int argc, char** argv)
SetConsoleCtrlHandler(handle_signal_win32, TRUE);
#endif
cxxopts::Options options(
"lokinet",
"LokiNET is a free, open source, private, "
"decentralized, \"market based sybil resistant\" "
"and IP based onion routing network");
// clang-format off
options.add_options()
#ifdef _WIN32
("install", "install win32 daemon to SCM", cxxopts::value<bool>())
("remove", "remove win32 daemon from SCM", cxxopts::value<bool>())
#endif
("h,help", "print this help message", cxxopts::value<bool>())
("version", "print version string", cxxopts::value<bool>())
("g,generate", "generate default configuration and exit", cxxopts::value<bool>())
("r,router", "run in routing mode instead of client only mode", cxxopts::value<bool>())
("f,force", "force writing config even if it already exists", cxxopts::value<bool>())
("config", "path to lokinet.ini configuration file", cxxopts::value<std::string>())
;
// clang-format on
options.parse_positional("config");
bool genconfigOnly = false;
bool overwrite = false;
std::optional<fs::path> configFile;
try
CLI::App cli{
"LokiNET is a free, open source, private, decentralized, market-based sybil resistant and "
"IP "
"based onion routing network",
"lokinet"};
command_line_options options{};
// flags: boolean values in command_line_options struct
cli.add_flag("--version", options.version, "Lokinet version");
cli.add_flag("g,--generate", options.generate, "Generate default configuration and exit");
cli.add_flag(
"r,--router", options.router, "Run lokinet in routing mode instead of client-only mode");
cli.add_flag("f,--force", options.force, "Force writing config even if file exists");
// options: string
cli.add_option("--config", options.configPath, "Path to lokinet.ini configuration file")
->capture_default_str();
if constexpr (llarp::platform::is_windows)
{
auto result = options.parse(argc, argv);
cli.add_flag("--install", options.win_install, "Install win32 daemon to SCM");
cli.add_flag("--remove", options.win_remove, "Remove win32 daemon from SCM");
}
if (result.count("help"))
try
{
std::cout << options.help() << std::endl;
return 0;
cli.parse(argc, argv);
}
if (result.count("version"))
catch (const CLI::ParseError& e)
{
return cli.exit(e);
}
std::optional<fs::path> configFile;
try
{
if (options.version)
{
std::cout << llarp::VERSION_FULL << std::endl;
return 0;
}
#ifdef _WIN32
if (result.count("install"))
if constexpr (llarp::platform::is_windows)
{
if (options.win_install)
{
install_win32_daemon();
return 0;
}
if (result.count("remove"))
if (options.win_remove)
{
uninstall_win32_daemon();
return 0;
}
#endif
if (result.count("generate") > 0)
{
genconfigOnly = true;
}
if (result.count("router") > 0)
if (options.configOnly)
{
opts.isSNode = true;
configFile = options.configPath;
}
if (result.count("force") > 0)
{
overwrite = true;
}
if (result.count("config") > 0)
catch (const CLI::OptionNotFound& e)
{
auto arg = result["config"].as<std::string>();
if (!arg.empty())
{
configFile = arg;
}
}
cli.exit(e);
}
catch (const cxxopts::option_not_exists_exception& ex)
catch (const CLI::Error& e)
{
std::cerr << ex.what();
std::cout << options.help() << std::endl;
return 1;
}
cli.exit(e);
};
if (configFile.has_value())
{
// when we have an explicit filepath
fs::path basedir = configFile->parent_path();
if (genconfigOnly)
if (options.configOnly)
{
try
{
llarp::ensureConfig(basedir, *configFile, overwrite, opts.isSNode);
llarp::ensureConfig(basedir, *configFile, options.overwrite, opts.isSNode);
}
catch (std::exception& ex)
{
@ -503,7 +469,10 @@ lokinet_main(int argc, char** argv)
try
{
llarp::ensureConfig(
llarp::GetDefaultDataDir(), llarp::GetDefaultConfigPath(), overwrite, opts.isSNode);
llarp::GetDefaultDataDir(),
llarp::GetDefaultConfigPath(),
options.overwrite,
opts.isSNode);
}
catch (std::exception& ex)
{
@ -513,10 +482,8 @@ lokinet_main(int argc, char** argv)
configFile = llarp::GetDefaultConfigPath();
}
if (genconfigOnly)
{
if (options.configOnly)
return 0;
}
#ifdef _WIN32
SetUnhandledExceptionFilter(&GenerateDump);
@ -586,57 +553,113 @@ lokinet_main(int argc, char** argv)
ctx.reset();
}
return code;
}
}
#ifdef _WIN32
// this sets up, configures and runs the main context
static void
run_main_context(std::optional<fs::path> confFile, const llarp::RuntimeOptions opts)
{
llarp::LogInfo(fmt::format("starting up {} {}", llarp::VERSION_FULL, llarp::RELEASE_MOTTO));
try
{
std::shared_ptr<llarp::Config> conf;
if (confFile)
{
llarp::LogInfo("Using config file: ", *confFile);
conf = std::make_shared<llarp::Config>(confFile->parent_path());
}
else
{
conf = std::make_shared<llarp::Config>(llarp::GetDefaultDataDir());
}
if (not conf->Load(confFile, opts.isSNode))
{
llarp::LogError("failed to parse configuration");
exit_code.set_value(1);
return;
}
VOID FAR PASCAL
SvcCtrlHandler(DWORD dwCtrl)
{
// Handle the requested control code.
ctx = std::make_shared<llarp::Context>();
ctx->Configure(std::move(conf));
switch (dwCtrl)
signal(SIGINT, handle_signal);
signal(SIGTERM, handle_signal);
#ifndef _WIN32
signal(SIGHUP, handle_signal);
signal(SIGUSR1, handle_signal);
#endif
try
{
case SERVICE_CONTROL_STOP:
// tell service we are stopping
llarp::log::debug(logcat, "Windows service controller gave SERVICE_CONTROL_STOP");
llarp::sys::service_manager->system_changed_our_state(llarp::sys::ServiceState::Stopping);
handle_signal(SIGINT);
ctx->Setup(opts);
}
catch (llarp::util::bind_socket_error& ex)
{
llarp::LogError(fmt::format("{}, is lokinet already running? 🤔", ex.what()));
exit_code.set_value(1);
return;
case SERVICE_CONTROL_INTERROGATE:
// report status
llarp::log::debug(logcat, "Got win32 service interrogate signal");
llarp::sys::service_manager->report_changed_state();
}
catch (std::exception& ex)
{
llarp::LogError(fmt::format("failed to start up lokinet: {}", ex.what()));
exit_code.set_value(1);
return;
}
llarp::util::SetThreadName("llarp-mainloop");
default:
llarp::log::debug(logcat, "Got win32 unhandled signal {}", dwCtrl);
break;
auto result = ctx->Run(opts);
exit_code.set_value(result);
}
catch (std::exception& e)
{
llarp::LogError("Fatal: caught exception while running: ", e.what());
exit_code.set_exception(std::current_exception());
}
catch (...)
{
llarp::LogError("Fatal: caught non-standard exception while running");
exit_code.set_exception(std::current_exception());
}
}
}
// The win32 daemon entry point is where we go when invoked as a windows service; we do the required
// service dance and then pretend we were invoked via main().
VOID FAR PASCAL
win32_daemon_entry(DWORD, LPTSTR* argv)
} // namespace
int
main(int argc, char* argv[])
{
// Register the handler function for the service
auto* svc = dynamic_cast<llarp::sys::SVC_Manager*>(llarp::sys::service_manager);
svc->handle = RegisterServiceCtrlHandler("lokinet", SvcCtrlHandler);
// Set up a default, stderr logging for very early logging; we'll replace this later once we read
// the desired log info from config.
llarp::log::add_sink(llarp::log::Type::Print, "stderr");
llarp::log::reset_level(llarp::log::Level::info);
if (svc->handle == nullptr)
llarp::logRingBuffer = std::make_shared<llarp::log::RingBufferSink>(100);
llarp::log::add_sink(llarp::logRingBuffer, llarp::log::DEFAULT_PATTERN_MONO);
#ifndef _WIN32
return lokinet_main(argc, argv);
#else
SERVICE_TABLE_ENTRY DispatchTable[] = {
{strdup("lokinet"), (LPSERVICE_MAIN_FUNCTION)win32_daemon_entry}, {NULL, NULL}};
// Try first to run as a service; if this works it fires off to win32_daemon_entry and doesn't
// return until the service enters STOPPED state.
if (StartServiceCtrlDispatcher(DispatchTable))
return 0;
auto error = GetLastError();
// We'll get this error if not invoked as a service, which is fine: we can just run directly
if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT)
{
llarp::LogError("failed to register daemon control handler");
return;
llarp::sys::service_manager->disable();
return lokinet_main(argc, argv);
}
else
{
llarp::log::critical(
logcat, "Error launching service: {}", std::system_category().message(error));
return 1;
}
// we hard code the args to lokinet_main.
// we yoink argv[0] (lokinet.exe path) and pass in the new args.
std::array args = {
reinterpret_cast<char*>(argv[0]),
reinterpret_cast<char*>(strdup("c:\\programdata\\lokinet\\lokinet.ini")),
reinterpret_cast<char*>(0)};
lokinet_main(args.size() - 1, args.data());
}
#endif
}

1
external/CLI11 vendored

@ -0,0 +1 @@
Subproject commit 4c7c8ddc45d2ef74584e5cd945f7a4d27c987748

4
external/CMakeLists.txt vendored
Unescape Escape View File

@ -26,7 +26,6 @@ if(SUBMODULE_CHECK)
message(STATUS "Checking submodules")
check_submodule(nlohmann)
check_submodule(cxxopts)
check_submodule(ghc-filesystem)
check_submodule(oxen-logging fmt spdlog)
check_submodule(pybind11)
@ -36,6 +35,7 @@ if(SUBMODULE_CHECK)
check_submodule(uvw)
check_submodule(cpr)
check_submodule(ngtcp2)
check_submodule(CLI11)
endif()
endif()
@ -78,7 +78,7 @@ if(WITH_HIVE)
add_subdirectory(pybind11 EXCLUDE_FROM_ALL)
endif()
add_subdirectory(cxxopts EXCLUDE_FROM_ALL)
system_or_submodule(CLI11 CLI11 CLI11>=2.2.0 CLI11)
if(WITH_PEERSTATS)
add_library(sqlite_orm INTERFACE)

1
external/cxxopts vendored

@ -1 +0,0 @@
Subproject commit c74846a891b3cc3bfa992d588b1295f528d43039

2
external/readme.md vendored
Unescape Escape View File

@ -1,7 +1,7 @@
directory for git submodules
* CLI11: cli argument parser
* cpr: curl for people, used by lokinet-bootstrap toolchain (to be removed)
* cxxopts: cli argument parser (to be removed)
* ghc-filesystem: `std::filesystem` shim lib for older platforms (like macos)
* ngtcp2: quic implementation
* nlohmann: json parser

2
llarp/CMakeLists.txt
Unescape Escape View File

@ -278,7 +278,7 @@ endif()
target_link_libraries(lokinet-amalgum PRIVATE libunbound)
target_link_libraries(lokinet-amalgum PUBLIC
cxxopts
CLI11
oxenc::oxenc
lokinet-platform
lokinet-config

5
llarp/context.cpp
Unescape Escape View File

@ -14,7 +14,10 @@
#include <llarp/util/service_manager.hpp>
#include <cxxopts.hpp>
#include <CLI/App.hpp>
#include <CLI/Formatter.hpp>
#include <CLI/Config.hpp>
#include <csignal>
#include <stdexcept>

Write Preview
Loading…
Cancel
Save