From e164970b009962602362709b8d567f3c3ef94d02 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 24 Jan 2019 10:14:54 -0500 Subject: [PATCH] make format --- llarp/ev/ev.cpp | 10 ++++++---- llarp/router/router.cpp | 17 +++++++++++------ llarp/service/endpoint.cpp | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/llarp/ev/ev.cpp b/llarp/ev/ev.cpp index 060131593..1ea82c935 100644 --- a/llarp/ev/ev.cpp +++ b/llarp/ev/ev.cpp @@ -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:"); diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp index 8661d0ea5..7ecfa628a 100644 --- a/llarp/router/router.cpp +++ b/llarp/router/router.cpp @@ -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; } diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp index f324faf78..6bafeb3a2 100644 --- a/llarp/service/endpoint.cpp +++ b/llarp/service/endpoint.cpp @@ -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;