rebase on current upstream staging

pull/283/head
Rick V 5 years ago
parent 3931b7d9d7
commit 69189214e0
No known key found for this signature in database
GPG Key ID: C0EDC8723FDC3465

@ -18,7 +18,7 @@ namespace llarp
if(amount > 0)
{
if(tcp.read)
tcp.read(&tcp, llarp::InitBuffer(buf, amount));
tcp.read(&tcp, llarp_buffer_t(buf, amount));
}
else
{
@ -122,7 +122,7 @@ namespace llarp
if(static_cast< size_t >(ret) > sz)
return -1;
b.sz = ret;
udp->recvfrom(udp, addr, b);
udp->recvfrom(udp, addr, ManagedBuffer{b});
return 0;
}
@ -181,7 +181,7 @@ namespace llarp
if(ret > 0 && t->recvpkt)
{
// does not have pktinfo
t->recvpkt(t, llarp::InitBuffer(buf, ret));
t->recvpkt(t, llarp_buffer_t(buf, ret));
}
return ret;
}

@ -162,7 +162,7 @@ tun_ev_loop(void* unused)
continue;
}
if(ev->t->recvpkt)
ev->t->recvpkt(ev->t, llarp::InitBuffer(pkt->buf, size));
ev->t->recvpkt(ev->t, llarp_buffer_t(pkt->buf, size));
ev->read(ev->readbuf, sizeof(ev->readbuf));
}
else
@ -219,7 +219,7 @@ namespace llarp
if(amount > 0)
{
if(tcp.read)
tcp.read(&tcp, llarp::InitBuffer(buf, amount));
tcp.read(&tcp, llarp_buffer_t(buf, amount));
}
else
{
@ -333,7 +333,7 @@ namespace llarp
if(static_cast< size_t >(ret) > sz)
return -1;
b.sz = ret;
udp->recvfrom(udp, addr, b);
udp->recvfrom(udp, addr, ManagedBuffer{b});
return 0;
}

@ -251,6 +251,7 @@ TEST_F(TestCryptoTypesSecret, secret_key_from_file_happy_bencode)
// - file not writeable
// - happy path
// Win32: check for root/admin/elevation privileges
#ifdef _WIN32
BOOL IsRunAsAdmin()
{

Loading…
Cancel
Save