From 5a3947ca5c189806d176bb02d66dd870bf244d37 Mon Sep 17 00:00:00 2001 From: Rick V Date: Mon, 18 Feb 2019 17:58:12 -0600 Subject: [PATCH] clang-format --- libabyss/src/client.cpp | 3 ++- libabyss/src/server.cpp | 3 ++- llarp/ev/ev.cpp | 2 +- llarp/link/server.cpp | 37 +++++++++++++------------- llarp/link/server.hpp | 5 ++-- llarp/link/utp_internal.hpp | 2 +- llarp/messages/relay_commit.cpp | 2 +- llarp/path/path.cpp | 47 +++++++++++++++------------------ llarp/router/abstractrouter.cpp | 1 - llarp/router/abstractrouter.hpp | 10 +++---- llarp/router/router.cpp | 4 +-- llarp/router/router.hpp | 5 ++-- llarp/service/endpoint.cpp | 27 +++++++++---------- llarp/service/protocol.hpp | 3 ++- llarp/util/buffer.hpp | 4 ++- llarp/util/status.hpp | 2 +- llarp/util/threadpool.h | 4 +-- 17 files changed, 80 insertions(+), 81 deletions(-) diff --git a/libabyss/src/client.cpp b/libabyss/src/client.cpp index 00abb90f4..5f0d00069 100644 --- a/libabyss/src/client.cpp +++ b/libabyss/src/client.cpp @@ -97,7 +97,8 @@ namespace abyss bool ShouldProcessHeader(const llarp::string_view& name) const { - return name == llarp::string_view("content-length") || name == llarp::string_view("content-type"); + return name == llarp::string_view("content-length") + || name == llarp::string_view("content-type"); } /// return true if we get a 200 status code diff --git a/libabyss/src/server.cpp b/libabyss/src/server.cpp index 8cb59e07e..5a982c9ee 100644 --- a/libabyss/src/server.cpp +++ b/libabyss/src/server.cpp @@ -103,7 +103,8 @@ namespace abyss ShouldProcessHeader(const string_view& name) const { // TODO: header whitelist - return name == string_view("content-type") || name == string_view("content-length"); + return name == string_view("content-type") + || name == string_view("content-length"); } bool diff --git a/llarp/ev/ev.cpp b/llarp/ev/ev.cpp index 9f9bf7e8a..4ca77cf99 100644 --- a/llarp/ev/ev.cpp +++ b/llarp/ev/ev.cpp @@ -26,7 +26,7 @@ llarp_ev_loop_alloc(struct llarp_ev_loop **ev) || (__APPLE__ && __MACH__) *ev = new llarp_kqueue_loop; #elif defined(_WIN32) || defined(_WIN64) || defined(__NT__) - *ev = new llarp_win32_loop; + *ev = new llarp_win32_loop; #else // TODO: fall back to a generic select-based event loop #error no event loop subclass diff --git a/llarp/link/server.cpp b/llarp/link/server.cpp index c9ebfbef5..e4ee6c449 100644 --- a/llarp/link/server.cpp +++ b/llarp/link/server.cpp @@ -173,24 +173,25 @@ namespace llarp util::StatusObject ILinkLayer::ExtractStatus() const { - std::vector pending, established; - - std::transform(m_Pending.begin(), m_Pending.end(), std::back_inserter(pending), [](const auto & item) -> util::StatusObject { - return item.second->ExtractStatus(); - }); - std::transform(m_AuthedLinks.begin(), m_AuthedLinks.end(), std::back_inserter(established), [](const auto & item) -> util::StatusObject { - return item.second->ExtractStatus(); - }); - - return { - {"name", Name()}, - {"rank", uint64_t(Rank())}, - {"addr", m_ourAddr.ToString()}, - {"sessions", util::StatusObject{ - {"pending", pending}, - {"established", established} - }} - }; + std::vector< util::StatusObject > pending, established; + + std::transform(m_Pending.begin(), m_Pending.end(), + std::back_inserter(pending), + [](const auto& item) -> util::StatusObject { + return item.second->ExtractStatus(); + }); + std::transform(m_AuthedLinks.begin(), m_AuthedLinks.end(), + std::back_inserter(established), + [](const auto& item) -> util::StatusObject { + return item.second->ExtractStatus(); + }); + + return {{"name", Name()}, + {"rank", uint64_t(Rank())}, + {"addr", m_ourAddr.ToString()}, + {"sessions", + util::StatusObject{{"pending", pending}, + {"established", established}}}}; } bool diff --git a/llarp/link/server.hpp b/llarp/link/server.hpp index 7349d571f..9c38f26b4 100644 --- a/llarp/link/server.hpp +++ b/llarp/link/server.hpp @@ -124,7 +124,7 @@ namespace llarp virtual const char* Name() const = 0; - util::StatusObject + util::StatusObject ExtractStatus() const override; void @@ -180,7 +180,8 @@ namespace llarp bool MapAddr(const RouterID& pk, ILinkSession* s); - void Tick(llarp_time_t now); + void + Tick(llarp_time_t now); LinkMessageHandler HandleMessage; TimeoutHandler HandleTimeout; diff --git a/llarp/link/utp_internal.hpp b/llarp/link/utp_internal.hpp index 306e48d0b..ad4ea0436 100644 --- a/llarp/link/utp_internal.hpp +++ b/llarp/link/utp_internal.hpp @@ -139,7 +139,7 @@ namespace llarp void Alive(); - util::StatusObject + util::StatusObject ExtractStatus() const override; /// base diff --git a/llarp/messages/relay_commit.cpp b/llarp/messages/relay_commit.cpp index 5931a452a..b357b70ab 100644 --- a/llarp/messages/relay_commit.cpp +++ b/llarp/messages/relay_commit.cpp @@ -281,7 +281,7 @@ namespace llarp using namespace std::placeholders; if(self->record.work && self->record.work->IsValid( - std::bind(&Crypto::shorthash, crypto, _1, _2), now)) + std::bind(&Crypto::shorthash, crypto, _1, _2), now)) { llarp::LogDebug("LRCM extended lifetime by ", self->record.work->extendedLifetime, " seconds for ", diff --git a/llarp/path/path.cpp b/llarp/path/path.cpp index b68d2ff14..7717bedfe 100644 --- a/llarp/path/path.cpp +++ b/llarp/path/path.cpp @@ -160,26 +160,24 @@ namespace llarp IHopHandler* PathContext::GetByUpstream(const RouterID& remote, const PathID_t& id) { - auto own = MapGet( - m_OurPaths, id, - [](__attribute__((unused)) const PathSet* s) -> bool { - // TODO: is this right? - return true; - }, - [remote, id](PathSet* p) -> IHopHandler* { - return p->GetByUpstream(remote, id); - }); + auto own = MapGet(m_OurPaths, id, + [](__attribute__((unused)) const PathSet* s) -> bool { + // TODO: is this right? + return true; + }, + [remote, id](PathSet* p) -> IHopHandler* { + return p->GetByUpstream(remote, id); + }); if(own) return own; - return MapGet( - m_TransitPaths, id, - [remote](const std::shared_ptr< TransitHop >& hop) -> bool { - return hop->info.upstream == remote; - }, - [](const std::shared_ptr< TransitHop >& h) -> IHopHandler* { - return h.get(); - }); + return MapGet(m_TransitPaths, id, + [remote](const std::shared_ptr< TransitHop >& hop) -> bool { + return hop->info.upstream == remote; + }, + [](const std::shared_ptr< TransitHop >& h) -> IHopHandler* { + return h.get(); + }); } bool @@ -196,14 +194,13 @@ namespace llarp IHopHandler* PathContext::GetByDownstream(const RouterID& remote, const PathID_t& id) { - return MapGet( - m_TransitPaths, id, - [remote](const std::shared_ptr< TransitHop >& hop) -> bool { - return hop->info.downstream == remote; - }, - [](const std::shared_ptr< TransitHop >& h) -> IHopHandler* { - return h.get(); - }); + return MapGet(m_TransitPaths, id, + [remote](const std::shared_ptr< TransitHop >& hop) -> bool { + return hop->info.downstream == remote; + }, + [](const std::shared_ptr< TransitHop >& h) -> IHopHandler* { + return h.get(); + }); } PathSet* diff --git a/llarp/router/abstractrouter.cpp b/llarp/router/abstractrouter.cpp index b56ffcd57..f70ba51b3 100644 --- a/llarp/router/abstractrouter.cpp +++ b/llarp/router/abstractrouter.cpp @@ -2,5 +2,4 @@ namespace llarp { - } // namespace llarp diff --git a/llarp/router/abstractrouter.hpp b/llarp/router/abstractrouter.hpp index 07fcea604..781479071 100644 --- a/llarp/router/abstractrouter.hpp +++ b/llarp/router/abstractrouter.hpp @@ -41,7 +41,6 @@ namespace llarp struct AbstractRouter : public util::IStateful { - virtual void OnSessionEstablished(RouterContact rc) = 0; @@ -139,12 +138,13 @@ namespace llarp CheckRenegotiateValid(RouterContact newRc, RouterContact oldRC) = 0; /// set router's service node whitelist - virtual void - SetRouterWhitelist(const std::vector & routers) =0 ; + virtual void + SetRouterWhitelist(const std::vector< RouterID > &routers) = 0; - /// visit each connected link session + /// visit each connected link session virtual void - ForEachPeer(std::function visit) const = 0; + ForEachPeer( + std::function< void(const ILinkSession *, bool) > visit) const = 0; }; } // namespace llarp diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp index 1f015fca2..a6d569718 100644 --- a/llarp/router/router.cpp +++ b/llarp/router/router.cpp @@ -679,9 +679,7 @@ namespace llarp Router::NumberOfConnectedRouters() const { size_t s = 0; - ForEachPeer([&s](const auto *, bool) { - ++s; - }); + ForEachPeer([&s](const auto *, bool) { ++s; }); return s; } diff --git a/llarp/router/router.hpp b/llarp/router/router.hpp index f84072ce2..35aca13cb 100644 --- a/llarp/router/router.hpp +++ b/llarp/router/router.hpp @@ -141,7 +141,7 @@ namespace llarp } void - SetRouterWhitelist(const std::vector & routers) override; + SetRouterWhitelist(const std::vector< RouterID > &routers) override; exit::Context & exitContext() override @@ -430,7 +430,8 @@ namespace llarp RouterID remote, const std::vector< RouterContact > &results) override; void - ForEachPeer(std::function< void(const ILinkSession *, bool) > visit) const override; + ForEachPeer( + std::function< void(const ILinkSession *, bool) > visit) const override; void ForEachPeer(std::function< void(ILinkSession *) > visit); diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp index dc125a6dc..a42e2a1db 100644 --- a/llarp/service/endpoint.cpp +++ b/llarp/service/endpoint.cpp @@ -266,9 +266,7 @@ namespace llarp auto itr = m_PrefetchedTags.find(tag); if(itr == m_PrefetchedTags.end()) { - itr = m_PrefetchedTags - .emplace(tag, CachedTagResult(tag, this)) - .first; + itr = m_PrefetchedTags.emplace(tag, CachedTagResult(tag, this)).first; } for(const auto& introset : itr->second.result) { @@ -1196,11 +1194,11 @@ namespace llarp m_SNodeSessions.emplace( snode, std::make_unique< exit::SNodeSession >( - snode, - std::bind(&Endpoint::HandleWriteIPPacket, this, - std::placeholders::_1, - [themIP]() -> huint32_t { return themIP; }), - m_Router, 2, numHops)); + snode, + std::bind(&Endpoint::HandleWriteIPPacket, this, + std::placeholders::_1, + [themIP]() -> huint32_t { return themIP; }), + m_Router, 2, numHops)); } } @@ -1310,13 +1308,12 @@ namespace llarp } } // no converstation - return EnsurePathToService( - remote, - [](Address, OutboundContext* c) { - if(c) - c->UpdateIntroSet(true); - }, - 5000, false); + return EnsurePathToService(remote, + [](Address, OutboundContext* c) { + if(c) + c->UpdateIntroSet(true); + }, + 5000, false); } bool diff --git a/llarp/service/protocol.hpp b/llarp/service/protocol.hpp index 191c2a0b6..f962ac931 100644 --- a/llarp/service/protocol.hpp +++ b/llarp/service/protocol.hpp @@ -134,7 +134,8 @@ namespace llarp Verify(Crypto* c, const ServiceInfo& from) const; bool - HandleMessage(routing::IMessageHandler* h, AbstractRouter* r) const override; + HandleMessage(routing::IMessageHandler* h, + AbstractRouter* r) const override; }; } // namespace service } // namespace llarp diff --git a/llarp/util/buffer.hpp b/llarp/util/buffer.hpp index 42582e670..3184084fc 100644 --- a/llarp/util/buffer.hpp +++ b/llarp/util/buffer.hpp @@ -125,7 +125,9 @@ struct llarp_buffer_t writef(const char *fmt, ...) __attribute__((format(printf, 2, 3))); ; #else - bool writef(const char *fmt, ...) __attribute__((__format__ (__MINGW_PRINTF_FORMAT, 2, 3))); + bool + writef(const char *fmt, ...) + __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 3))); ; #endif diff --git a/llarp/util/status.hpp b/llarp/util/status.hpp index 02e06ea42..772101595 100644 --- a/llarp/util/status.hpp +++ b/llarp/util/status.hpp @@ -71,7 +71,7 @@ namespace llarp /// an entity that has a status that can be extracted struct IStateful { - virtual ~IStateful() {}; + virtual ~IStateful(){}; virtual StatusObject ExtractStatus() const = 0; diff --git a/llarp/util/threadpool.h b/llarp/util/threadpool.h index c7a068bbc..5adaff876 100644 --- a/llarp/util/threadpool.h +++ b/llarp/util/threadpool.h @@ -16,8 +16,8 @@ struct llarp_threadpool std::queue< std::function< void(void) > > jobs; llarp_threadpool(int workers, const char *name) - : impl( - std::make_unique< llarp::thread::ThreadPool >(workers, workers * 128)) + : impl(std::make_unique< llarp::thread::ThreadPool >(workers, + workers * 128)) { (void)name; }