Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-05 21:20:38 +00:00
Code Issues Projects Releases Wiki Activity

OMQ_Request handling logic change

Browse Source
This commit is contained in:
dan 2023-02-01 14:26:58 -08:00
parent b2e8cde64b
commit 9bfe881a35
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
daemon/lokinet-vpn.cpp
View File

@ -202,16 +202,24 @@ main(int argc, char* argv[])
if (options.killDaemon)
{
if (not OMQ_Request(omq, connectionID, "llarp.halt"))
auto maybe_halt = OMQ_Request(omq, connectionID, "llarp.halt");
if (not maybe_halt)
return exit_error("Call to llarp.halt failed");
return 0;
if (auto err_it = maybe_halt->find("error");
err_it != maybe_halt->end() and not err_it.value().is_null())
{
return exit_error("{}", err_it.value());
}
}
if (options.printStatus)
{
const auto maybe_status = OMQ_Request(omq, connectionID, "llarp.status");
if (not maybe_status)
return exit_error("call to llarp.status failed");
return exit_error("Call to llarp.status failed");
try
{
@ -219,7 +227,7 @@ main(int argc, char* argv[])
if (ep.empty())
{
std::cout << "no exits" << std::endl;
std::cout << "No exits found" << std::endl;
}
else
{
@ -231,7 +239,7 @@ main(int argc, char* argv[])
}
catch (std::exception& ex)
{
return exit_error("failed to parse result: {}", ex.what());
return exit_error("Failed to parse result: {}", ex.what());
}
return 0;
}
@ -240,8 +248,16 @@ main(int argc, char* argv[])
{
nlohmann::json opts{{"exit_addresses", std::move(options.swapExits)}};
if (not OMQ_Request(omq, connectionID, "llarp.swap_exits", std::move(opts)))
auto maybe_swap = OMQ_Request(omq, connectionID, "llarp.swap_exits", std::move(opts));
if (not maybe_swap)
return exit_error("Failed to swap exit node connections");
if (auto err_it = maybe_swap->find("error");
err_it != maybe_swap->end() and not err_it.value().is_null())
{
return exit_error("{}", err_it.value());
}
}
if (options.vpnUp)
@ -253,7 +269,7 @@ main(int argc, char* argv[])
auto maybe_result = OMQ_Request(omq, connectionID, "llarp.map_exit", std::move(opts));
if (not maybe_result)
return exit_error("could not add exit");
return exit_error("Could not add exit");
if (auto err_it = maybe_result->find("error");
err_it != maybe_result->end() and not err_it.value().is_null())
@ -266,8 +282,17 @@ main(int argc, char* argv[])
nlohmann::json opts{{"unmap_exit", true}};
if (options.range)
opts["ip_range"] = *options.range;
if (not OMQ_Request(omq, connectionID, "llarp.unmap_exit", std::move(opts)))
auto maybe_down = OMQ_Request(omq, connectionID, "llarp.unmap_exit", std::move(opts));
if (not maybe_down)
return exit_error("Failed to unmap exit node connection");
if (auto err_it = maybe_down->find("error");
err_it != maybe_down->end() and not err_it.value().is_null())
{
return exit_error("{}", err_it.value());
}
}
return 0;

6
llarp/rpc/rpc_server.cpp
View File

@ -422,6 +422,12 @@ namespace llarp::rpc
return;
}
if (swapexits.request.exit_addresses.size() < 2)
{
SetJSONError("Exit addresses not passed", swapexits.response);
return;
}
// steal replier from swapexit RPC endpoint
unmap_request.replier.emplace(swapexits.move());