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

Merge commit 'b1808c9' into MergeUpstream3

This commit is contained in:
Doyle 2020-05-28 15:39:47 +10:00
parent c9cbbb7319 b1808c9920
commit 10bc1753e6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -333,9 +333,8 @@ application.
### On FreeBSD:
The project can be built from scratch by following instructions for Linux above(but use `gmake` instead of `make`). If you are running loki in a jail you need to add the flag: `allow.sysvipc=1` to your jail configuration, otherwise lmdb will throw the error message: `Failed to open lmdb environment: Function not implemented`.
We expect to add Loki into the ports tree in the near future, which will aid in managing installations using ports or packages.
The project can be built from scratch by following instructions for Linux above(but use `gmake` instead of `make`).
If you are running Loki in a jail, you need to add `sysvsem="new"` to your jail configuration, otherwise lmdb will throw the error message: `Failed to open lmdb environment: Function not implemented`.
### On OpenBSD:

12
src/daemon/rpc_command_executor.cpp
View File

@ -1228,13 +1228,19 @@ bool rpc_command_executor::print_bans()
if (!invoke<GETBANS>({}, res, "Failed to retrieve ban list"))
return false;
for (const auto& ban : res.bans)
tools::msg_writer() << ban.host << " banned for " << ban.seconds << " seconds";
if (!res.bans.empty())
{
for (auto i = res.bans.begin(); i != res.bans.end(); ++i)
{
tools::msg_writer() << i->host << " banned for " << i->seconds << " seconds";
}
}
else
tools::msg_writer() << "No IPs are banned";
return true;
}
bool rpc_command_executor::ban(const std::string &address, time_t seconds, bool clear_ban)
{
SETBANS::request req{};