clang-format

pull/323/head
Rick V 5 years ago
parent 0f45e286ff
commit 5a3947ca5c
No known key found for this signature in database
GPG Key ID: C0EDC8723FDC3465

@ -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

@ -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

@ -175,22 +175,23 @@ namespace llarp
{
std::vector< util::StatusObject > pending, established;
std::transform(m_Pending.begin(), m_Pending.end(), std::back_inserter(pending), [](const auto & item) -> util::StatusObject {
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 {
std::transform(m_AuthedLinks.begin(), m_AuthedLinks.end(),
std::back_inserter(established),
[](const auto& item) -> util::StatusObject {
return item.second->ExtractStatus();
});
return {
{"name", Name()},
return {{"name", Name()},
{"rank", uint64_t(Rank())},
{"addr", m_ourAddr.ToString()},
{"sessions", util::StatusObject{
{"pending", pending},
{"established", established}
}}
};
{"sessions",
util::StatusObject{{"pending", pending},
{"established", established}}}};
}
bool

@ -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;

@ -160,8 +160,7 @@ namespace llarp
IHopHandler*
PathContext::GetByUpstream(const RouterID& remote, const PathID_t& id)
{
auto own = MapGet(
m_OurPaths, id,
auto own = MapGet(m_OurPaths, id,
[](__attribute__((unused)) const PathSet* s) -> bool {
// TODO: is this right?
return true;
@ -172,8 +171,7 @@ namespace llarp
if(own)
return own;
return MapGet(
m_TransitPaths, id,
return MapGet(m_TransitPaths, id,
[remote](const std::shared_ptr< TransitHop >& hop) -> bool {
return hop->info.upstream == remote;
},
@ -196,8 +194,7 @@ namespace llarp
IHopHandler*
PathContext::GetByDownstream(const RouterID& remote, const PathID_t& id)
{
return MapGet(
m_TransitPaths, id,
return MapGet(m_TransitPaths, id,
[remote](const std::shared_ptr< TransitHop >& hop) -> bool {
return hop->info.downstream == remote;
},

@ -2,5 +2,4 @@
namespace llarp
{
} // namespace llarp

@ -41,7 +41,6 @@ namespace llarp
struct AbstractRouter : public util::IStateful
{
virtual void
OnSessionEstablished(RouterContact rc) = 0;
@ -144,7 +143,8 @@ namespace llarp
/// visit each connected link session
virtual void
ForEachPeer(std::function<void(const ILinkSession*, bool)> visit) const = 0;
ForEachPeer(
std::function< void(const ILinkSession *, bool) > visit) const = 0;
};
} // namespace llarp

@ -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;
}

@ -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);

@ -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)
{
@ -1310,8 +1308,7 @@ namespace llarp
}
}
// no converstation
return EnsurePathToService(
remote,
return EnsurePathToService(remote,
[](Address, OutboundContext* c) {
if(c)
c->UpdateIntroSet(true);

@ -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

@ -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

@ -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;
}

Loading…
Cancel
Save