make format

pull/246/head
Jeff Becker 6 years ago
parent 7bc0b5f82b
commit e164970b00
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -172,13 +172,15 @@ llarp_ev_add_tun(struct llarp_ev_loop *loop, struct llarp_tun_io *tun)
} }
tun->netmask = num; tun->netmask = num;
const std::string addr = ifaddr.substr(0, pos); 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); llarp::LogInfo("IfAddr autodetect: ", tun->ifaddr, "/", tun->netmask);
} }
if(strcmp(tun->ifname, "") == 0 || strcmp(tun->ifname, "auto")) if(strcmp(tun->ifname, "") == 0 || strcmp(tun->ifname, "auto"))
{ {
std::string ifname = llarp::findFreeLokiTunIfName(); 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::LogInfo("IfName autodetect: ", tun->ifname);
} }
llarp::LogDebug("Tun Interface will use the following settings:"); llarp::LogDebug("Tun Interface will use the following settings:");

@ -1611,7 +1611,8 @@ namespace llarp
auto &rc = self->bootstrapRCList.back(); auto &rc = self->bootstrapRCList.back();
if(!rc.Read(val)) 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(); self->bootstrapRCList.pop_back();
return; return;
} }
@ -1632,6 +1633,7 @@ namespace llarp
} }
self->bootstrapRCList.pop_back(); self->bootstrapRCList.pop_back();
} }
}
else if(StrEq(section, "router")) else if(StrEq(section, "router"))
{ {
if(StrEq(key, "netid")) if(StrEq(key, "netid"))
@ -1640,8 +1642,10 @@ namespace llarp
{ {
llarp::LogWarn("!!!! you have manually set netid to be '", val, llarp::LogWarn("!!!! you have manually set netid to be '", val,
"' which does not equal '", Version::LLARP_NET_ID, "' which does not equal '", Version::LLARP_NET_ID,
"' you will run as a different network, good luck and " "' you will run as a different network, good luck "
"don't forget: something something MUH traffic shape " "and "
"don't forget: something something MUH traffic "
"shape "
"correlation !!!!"); "correlation !!!!");
llarp::NetID::DefaultValue() = llarp::NetID::DefaultValue() =
llarp::NetID(reinterpret_cast< const byte_t * >(strdup(val))); llarp::NetID(reinterpret_cast< const byte_t * >(strdup(val)));
@ -1669,7 +1673,8 @@ namespace llarp
{ {
self->transport_keyfile = val; 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; self->ident_keyfile = val;
} }

Loading…
Cancel
Save