oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/majestrate/loki-network

Browse source
This commit is contained in:
Jeff Becker 2019-04-27 07:51:47 -04:00
commit c3c26df6e3
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
llarp/hook/shell.cpp
View file

@ -2,6 +2,10 @@
#include <util/threadpool.h>
#include <util/logger.hpp>
#include <sys/wait.h>
#include <unistd.h>
#if defined(Darwin)
#include <crt_externs.h>
#endif
namespace llarp
{
@ -23,28 +27,23 @@ namespace llarp
{
ExecShellHookJob *self = static_cast< ExecShellHookJob * >(user);
std::vector< std::string > _args;
std::vector< char * > args;
std::istringstream s(self->m_File);
for(std::string arg; std::getline(s, arg, ' ');)
{
_args.emplace_back(std::move(arg));
char * ptr = (char *) _args.back().c_str();
args.push_back(ptr);
}
std::vector< char * > args;
if(_args.size() > 1)
{
auto itr = _args.begin();
++itr;
while(itr != _args.end())
{
args.emplace_back(itr->c_str());
++itr;
}
}
args.emplace_back(0);
args.push_back(0);
std::vector< std::string > _env(self->m_env.size() + 1);
std::vector< char * > env;
// copy environ
#if defined(Darwin)
char **ptr = *_NSGetEnviron();
#else
char **ptr = environ;
#endif
do
{
env.emplace_back(*ptr);
@ -54,9 +53,10 @@ namespace llarp
for(const auto &item : self->m_env)
{
_env.emplace_back(item.first + "=" + item.second);
env.emplace_back(_env.back().c_str());
char * ptr = (char *) _env.back().c_str();
env.push_back(ptr);
}
env.emplace_back(0);
env.push_back(0);
pid_t child_process = ::fork();
if(child_process == -1)
{
@ -71,7 +71,7 @@ namespace llarp
LogInfo(_args[0], " exit code: ", status);
delete self;
}
else if(::execvpe(_args[0].c_str(), args.data(), env.data()) == -1)
else if(::execve(_args[0].c_str(), args.data(), env.data()) == -1)
{
LogError("failed to exec ", _args[0], " : ", strerror(errno));
}
@ -129,4 +129,4 @@ namespace llarp
return ptr;
}
} // namespace hooks
} // namespace llarp
} // namespace llarp

2
llarp/service/hidden_service_address_lookup.cpp
View file

@ -38,7 +38,7 @@ namespace llarp
{
auto msg = std::make_shared< routing::DHTMessage >();
msg->M.emplace_back(
std::make_unique< dht::FindIntroMessage >(txid, remote, 0));
std::make_unique< dht::FindIntroMessage >(txid, remote, true));
return msg;
}