make format

pull/90/head
Jeff Becker 6 years ago
parent 62533dda1d
commit 25fac844eb
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -14,9 +14,8 @@
struct dnsd_context;
/// sendto hook functor
using sendto_dns_hook_func =
std::function< ssize_t(void *sock, const struct sockaddr *from,
llarp_buffer_t) >;
using sendto_dns_hook_func = std::function< ssize_t(
void *sock, const struct sockaddr *from, llarp_buffer_t) >;
// FIXME: llarp::Addr
/// DNS server query request
@ -53,7 +52,7 @@ struct dnsd_query_hook_response
/// called by the llarp_handle_dns_recvfrom generic (dnsd/dnsc) handler in dns
void
llarp_handle_dnsd_recvfrom(struct llarp_udp_io *udp,
const struct sockaddr *addr,llarp_buffer_t buf);
const struct sockaddr *addr, llarp_buffer_t buf);
//
// output structures/functions:

@ -66,7 +66,8 @@ struct llarp_udp_io
/// called every event loop tick after reads
void (*tick)(struct llarp_udp_io *);
/// sockaddr * is the source address
void (*recvfrom)(struct llarp_udp_io *, const struct sockaddr *,llarp_buffer_t);
void (*recvfrom)(struct llarp_udp_io *, const struct sockaddr *,
llarp_buffer_t);
};
/// add UDP handler

@ -108,7 +108,7 @@ namespace tl
/// \exclude
#define TL_OPTIONAL_11_CONSTEXPR
#else
/// \exclude
/// \exclude
#define TL_OPTIONAL_11_CONSTEXPR constexpr
#endif
@ -478,8 +478,7 @@ namespace tl
struct optional_storage_base
{
TL_OPTIONAL_11_CONSTEXPR
optional_storage_base() noexcept
: m_dummy(), m_has_value(false)
optional_storage_base() noexcept : m_dummy(), m_has_value(false)
{
}
@ -515,8 +514,7 @@ namespace tl
struct optional_storage_base< T, true >
{
TL_OPTIONAL_11_CONSTEXPR
optional_storage_base() noexcept
: m_dummy(), m_has_value(false)
optional_storage_base() noexcept : m_dummy(), m_has_value(false)
{
}

@ -236,40 +236,46 @@ namespace abyss
for(const auto& item : m_SendHeaders)
{
// header name
if(!llarp_tcp_conn_async_write(m_Conn, llarp::InitBuffer(item.first.c_str(),
item.first.size())))
if(!llarp_tcp_conn_async_write(
m_Conn,
llarp::InitBuffer(item.first.c_str(), item.first.size())))
{
CloseError();
return;
}
// header delimiter
if(!llarp_tcp_conn_async_write(m_Conn, llarp::InitBuffer(buf, 2 * sizeof(char))))
if(!llarp_tcp_conn_async_write(
m_Conn, llarp::InitBuffer(buf, 2 * sizeof(char))))
{
CloseError();
return;
}
// header value
if(!llarp_tcp_conn_async_write(m_Conn, llarp::InitBuffer(item.second.c_str(),
item.second.size())))
if(!llarp_tcp_conn_async_write(
m_Conn,
llarp::InitBuffer(item.second.c_str(), item.second.size())))
{
CloseError();
return;
}
// CRLF
if(!llarp_tcp_conn_async_write(m_Conn, llarp::InitBuffer(buf + 2, 2 * sizeof(char))))
if(!llarp_tcp_conn_async_write(
m_Conn, llarp::InitBuffer(buf + 2, 2 * sizeof(char))))
{
CloseError();
return;
}
}
// CRLF
if(!llarp_tcp_conn_async_write(m_Conn, llarp::InitBuffer(buf + 2, 2 * sizeof(char))))
if(!llarp_tcp_conn_async_write(
m_Conn, llarp::InitBuffer(buf + 2, 2 * sizeof(char))))
{
CloseError();
return;
}
// request body
if(!llarp_tcp_conn_async_write(m_Conn, llarp::InitBuffer(body.c_str(), body.size())))
if(!llarp_tcp_conn_async_write(
m_Conn, llarp::InitBuffer(body.c_str(), body.size())))
{
CloseError();
return;

@ -115,7 +115,8 @@ namespace abyss
m_State = eWriteHTTPBody;
return llarp_tcp_conn_async_write(_conn, llarp::InitBuffer(content, contentLength));
return llarp_tcp_conn_async_write(
_conn, llarp::InitBuffer(content, contentLength));
}
bool
@ -260,7 +261,7 @@ namespace abyss
OnRead(llarp_tcp_conn* conn, llarp_buffer_t buf)
{
ConnImpl* self = static_cast< ConnImpl* >(conn->user);
if(!self->ProcessRead((const char *)buf.base, buf.sz))
if(!self->ProcessRead((const char*)buf.base, buf.sz))
self->MarkBad();
}

@ -678,8 +678,9 @@ llarp_resolve_host(struct dnsc_context *const dnsc, const char *url,
// bytes");
// ssize_t ret = llarp_ev_udp_sendto(dnsc->udp, dnsc->server, bytes, length);
ssize_t ret = llarp_ev_udp_sendto(dnsc->udp, dnsc->resolvers[0],
llarp::InitBuffer(dns_packet->request, dns_packet->length));
ssize_t ret = llarp_ev_udp_sendto(
dnsc->udp, dnsc->resolvers[0],
llarp::InitBuffer(dns_packet->request, dns_packet->length));
delete dns_packet;
if(ret < 0)
{

@ -12,7 +12,7 @@ constexpr size_t BUFFER_SIZE = 1500;
ssize_t
raw_sendto_dns_hook_func(void *sock, const struct sockaddr *from,
llarp_buffer_t buf)
llarp_buffer_t buf)
{
int *fd = (int *)sock;
// how do we get to these??
@ -523,7 +523,8 @@ llarp_handle_dnsd_recvfrom(struct llarp_udp_io *udp,
&llarp_sendto_dns_hook_func; // set sock hook
// llarp::LogInfo("Server request's UDP ", llarp_dns_request->user);
handle_recvfrom((const char*)buf.base, buf.sz, llarp_dns_request->from, llarp_dns_request);
handle_recvfrom((const char *)buf.base, buf.sz, llarp_dns_request->from,
llarp_dns_request);
}
void

@ -110,7 +110,8 @@ int
llarp_ev_udp_sendto(struct llarp_udp_io *udp, const sockaddr *to,
llarp_buffer_t buf)
{
auto ret = static_cast< llarp::ev_io * >(udp->impl)->sendto(to, buf.base, buf.sz);
auto ret =
static_cast< llarp::ev_io * >(udp->impl)->sendto(to, buf.base, buf.sz);
if(ret == -1 && errno != 0)
{
llarp::LogWarn("sendto failed ", strerror(errno));
@ -141,7 +142,7 @@ llarp_tcp_conn_async_write(struct llarp_tcp_conn *conn, llarp_buffer_t buf)
return false;
}
size_t sz = buf.sz;
buf.cur = buf.base;
buf.cur = buf.base;
while(sz > EV_WRITE_BUF_SZ)
{
if(!impl->queue_write(buf.cur, EV_WRITE_BUF_SZ))
@ -221,8 +222,7 @@ llarp_ev_tun_async_write(struct llarp_tun_io *tun, llarp_buffer_t buf)
llarp::LogWarn("packet too big, ", buf.sz, " > ", EV_WRITE_BUF_SZ);
return false;
}
return static_cast< llarp::tun * >(tun->impl)->queue_write(
buf.base, buf.sz);
return static_cast< llarp::tun * >(tun->impl)->queue_write(buf.base, buf.sz);
}
void

@ -219,7 +219,7 @@ namespace llarp
if(ret > 0 && t->recvpkt)
{
// does not have pktinfo
t->recvpkt(t, llarp::InitBuffer(buf,ret));
t->recvpkt(t, llarp::InitBuffer(buf, ret));
}
return ret;
}

@ -26,7 +26,7 @@ namespace llarp
if(sz == 0)
{
if(tcp.read)
tcp.read(&tcp, llarp::InitBuffer(nullptr,0));
tcp.read(&tcp, llarp::InitBuffer(nullptr, 0));
return 0;
}
if(_shouldClose)
@ -272,7 +272,7 @@ namespace llarp
ssize_t ret = tuntap_read(tunif, buf, sz);
if(ret > offset && t->recvpkt)
{
byte_t * ptr = ((byte_t*)buf) + offset;
byte_t* ptr = ((byte_t*)buf) + offset;
ret -= offset;
t->recvpkt(t, llarp::InitBuffer(ptr, ret));
}

@ -335,7 +335,7 @@ namespace llarp
TunEndpoint::Tick(llarp_time_t now)
{
// call tun code in endpoint logic in case of network isolation
//llarp_logic_queue_job(EndpointLogic(), {this, handleTickTun});
// llarp_logic_queue_job(EndpointLogic(), {this, handleTickTun});
FlushSend();
Endpoint::Tick(now);
}
@ -535,8 +535,7 @@ namespace llarp
TunEndpoint *self = static_cast< TunEndpoint * >(tun->user);
if(!self->m_UserToNetworkPktQueue.EmplaceIf(
[buf](net::IPv4Packet &pkt) -> bool {
return pkt.Load(buf)
&& pkt.Header()->version == 4;
return pkt.Load(buf) && pkt.Header()->version == 4;
}))
{
llarp::LogInfo("Failed to parse ipv4 packet");

@ -378,7 +378,7 @@ _llarp_nt_getadaptersaddresses(struct llarp_nt_ifaddrs_t** ifap)
/* default IPv6 route */
if(AF_INET6 == lpSockaddr->sa_family && 0 == prefix->PrefixLength
&& IN6_IS_ADDR_UNSPECIFIED(
&((struct sockaddr_in6*)(lpSockaddr))->sin6_addr))
&((struct sockaddr_in6*)(lpSockaddr))->sin6_addr))
{
#ifdef DEBUG
fprintf(stderr,

@ -41,11 +41,11 @@ namespace llarp
return 0;
}
size_t
PathSet::NumPathsExistingAt(llarp_time_t futureTime) const
size_t
PathSet::NumPathsExistingAt(llarp_time_t futureTime) const
{
size_t num = 0;
for(const auto & item : m_Paths)
for(const auto& item : m_Paths)
{
if(!item.second->Expired(futureTime))
++num;

Loading…
Cancel
Save