mirror of
https://github.com/oxen-io/lokinet
synced 2023-12-14 06:53:00 +01:00
make format
This commit is contained in:
parent
7bc0b5f82b
commit
e164970b00
|
@ -152,7 +152,7 @@ llarp_ev_add_tun(struct llarp_ev_loop *loop, struct llarp_tun_io *tun)
|
|||
if(strcmp(tun->ifaddr, "") == 0 || strcmp(tun->ifaddr, "auto"))
|
||||
{
|
||||
std::string ifaddr = llarp::findFreePrivateRange();
|
||||
auto pos = ifaddr.find("/");
|
||||
auto pos = ifaddr.find("/");
|
||||
if(pos == std::string::npos)
|
||||
{
|
||||
llarp::LogWarn("Auto ifaddr didn't return a netmask: ", ifaddr);
|
||||
|
@ -170,15 +170,17 @@ llarp_ev_add_tun(struct llarp_ev_loop *loop, struct llarp_tun_io *tun)
|
|||
llarp::LogError("bad ifaddr netmask value: ", ifaddr);
|
||||
return false;
|
||||
}
|
||||
tun->netmask = num;
|
||||
tun->netmask = num;
|
||||
const std::string addr = ifaddr.substr(0, pos);
|
||||
std::copy_n(addr.begin(), std::min(sizeof(tun->ifaddr), addr.size()), tun->ifaddr);
|
||||
std::copy_n(addr.begin(), std::min(sizeof(tun->ifaddr), addr.size()),
|
||||
tun->ifaddr);
|
||||
llarp::LogInfo("IfAddr autodetect: ", tun->ifaddr, "/", tun->netmask);
|
||||
}
|
||||
if(strcmp(tun->ifname, "") == 0 || strcmp(tun->ifname, "auto"))
|
||||
{
|
||||
std::string ifname = llarp::findFreeLokiTunIfName();
|
||||
std::copy_n(ifname.begin(), std::min(sizeof(tun->ifname), ifname.size()), tun->ifname);
|
||||
std::copy_n(ifname.begin(), std::min(sizeof(tun->ifname), ifname.size()),
|
||||
tun->ifname);
|
||||
llarp::LogInfo("IfName autodetect: ", tun->ifname);
|
||||
}
|
||||
llarp::LogDebug("Tun Interface will use the following settings:");
|
||||
|
|
|
@ -1611,7 +1611,8 @@ namespace llarp
|
|||
auto &rc = self->bootstrapRCList.back();
|
||||
if(!rc.Read(val))
|
||||
{
|
||||
llarp::LogWarn("failed to decode bootstrap RC, file='", val, "' rc=", rc);
|
||||
llarp::LogWarn("failed to decode bootstrap RC, file='", val,
|
||||
"' rc=", rc);
|
||||
self->bootstrapRCList.pop_back();
|
||||
return;
|
||||
}
|
||||
|
@ -1621,16 +1622,17 @@ namespace llarp
|
|||
}
|
||||
else
|
||||
{
|
||||
if(rc.IsExpired(self->Now()))
|
||||
if(rc.IsExpired(self->Now()))
|
||||
{
|
||||
llarp::LogWarn("Bootstrap node ", RouterID(rc.pubkey),
|
||||
" is too old and needs to be refreshed");
|
||||
" is too old and needs to be refreshed");
|
||||
}
|
||||
else
|
||||
{
|
||||
llarp::LogError("malformed rc file='", val, "' rc=", rc);
|
||||
}
|
||||
self->bootstrapRCList.pop_back();
|
||||
}
|
||||
}
|
||||
else if(StrEq(section, "router"))
|
||||
{
|
||||
|
@ -1640,8 +1642,10 @@ namespace llarp
|
|||
{
|
||||
llarp::LogWarn("!!!! you have manually set netid to be '", val,
|
||||
"' which does not equal '", Version::LLARP_NET_ID,
|
||||
"' you will run as a different network, good luck and "
|
||||
"don't forget: something something MUH traffic shape "
|
||||
"' you will run as a different network, good luck "
|
||||
"and "
|
||||
"don't forget: something something MUH traffic "
|
||||
"shape "
|
||||
"correlation !!!!");
|
||||
llarp::NetID::DefaultValue() =
|
||||
llarp::NetID(reinterpret_cast< const byte_t * >(strdup(val)));
|
||||
|
@ -1669,7 +1673,8 @@ namespace llarp
|
|||
{
|
||||
self->transport_keyfile = val;
|
||||
}
|
||||
if((StrEq(key, "identity-privkey") || StrEq(key, "ident-privkey")) && !self->usingSNSeed)
|
||||
if((StrEq(key, "identity-privkey") || StrEq(key, "ident-privkey"))
|
||||
&& !self->usingSNSeed)
|
||||
{
|
||||
self->ident_keyfile = val;
|
||||
}
|
||||
|
|
|
@ -512,7 +512,7 @@ namespace llarp
|
|||
Endpoint::Start()
|
||||
{
|
||||
// how can I tell if a m_Identity isn't loaded?
|
||||
//this->LoadKeyFile();
|
||||
// this->LoadKeyFile();
|
||||
if(!m_DataHandler)
|
||||
{
|
||||
m_DataHandler = this;
|
||||
|
|
Loading…
Reference in a new issue