Archives
/
lokinet
mirror of https://github.com/oxen-io/lokinet
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #33 from despair86/master

Browse Source 
fix win32 event loop
pull/34/head
Jeff 6 years ago committed by GitHub
parent 77c24d655c ae4a6ac217
commit a63397855c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File

4
include/llarp/dns.hpp
Unescape Escape View File

@ -23,9 +23,9 @@ struct dnsd_context;
struct dns_tracker struct dns_tracker
{ {
// uint c_responses; // uint c_responses;
uint c_requests; uint32_t c_requests;
// request has to be a pointer // request has to be a pointer
std::unordered_map< uint, std::unique_ptr< dnsc_answer_request > > std::unordered_map< uint32_t, std::unique_ptr< dnsc_answer_request > >
client_request; client_request;
// FIXME: support multiple dns server contexts // FIXME: support multiple dns server contexts
dnsd_context *dnsd; dnsd_context *dnsd;

2
include/tuntap.h
Unescape Escape View File

@ -145,7 +145,7 @@ extern "C"
int mode; int mode;
#endif #endif
#if defined(Windows) #if defined(Windows)
OVERLAPPED ovl; OVERLAPPED ovl[2];
#endif #endif
}; };

8
llarp/dnsc.cpp
Unescape Escape View File

@ -228,7 +228,7 @@ generic_handle_dnsc_recvfrom(dnsc_answer_request *request,
// FIXME: only handling one atm // FIXME: only handling one atm
dns_msg_question *question = nullptr; dns_msg_question *question = nullptr;
for(uint i = 0; i < hdr->qdCount; i++) for(uint32_t i = 0; i < hdr->qdCount; i++)
{ {
question = decode_question((const char *)castBuf); question = decode_question((const char *)castBuf);
llarp::LogDebug("Read a question"); llarp::LogDebug("Read a question");
@ -241,7 +241,7 @@ generic_handle_dnsc_recvfrom(dnsc_answer_request *request,
// FIXME: only handling one atm // FIXME: only handling one atm
std::vector< dns_msg_answer * > answers; std::vector< dns_msg_answer * > answers;
dns_msg_answer *answer = nullptr; dns_msg_answer *answer = nullptr;
for(uint i = 0; i < hdr->anCount; i++) for(uint32_t i = 0; i < hdr->anCount; i++)
{ {
answer = decode_answer((const char *)castBuf); answer = decode_answer((const char *)castBuf);
answers.push_back(answer); answers.push_back(answer);
@ -275,7 +275,7 @@ generic_handle_dnsc_recvfrom(dnsc_answer_request *request,
// handle authority records (usually no answers with these, so we'll just // handle authority records (usually no answers with these, so we'll just
// stomp) usually NS records tho // stomp) usually NS records tho
for(uint i = 0; i < hdr->nsCount; i++) for(uint32_t i = 0; i < hdr->nsCount; i++)
{ {
answer = decode_answer((const char *)castBuf); answer = decode_answer((const char *)castBuf);
// answers.push_back(answer); // answers.push_back(answer);
@ -602,7 +602,7 @@ llarp_host_resolved(dnsc_answer_request *const request)
dns_tracker *tracker = (dns_tracker *)request->context->tracker; dns_tracker *tracker = (dns_tracker *)request->context->tracker;
auto val = std::find_if( auto val = std::find_if(
tracker->client_request.begin(), tracker->client_request.end(), tracker->client_request.begin(), tracker->client_request.end(),
[request](std::pair< const uint, std::unique_ptr< dnsc_answer_request > > [request](std::pair< const uint32_t, std::unique_ptr< dnsc_answer_request > >
&element) { return element.second.get() == request; }); &element) { return element.second.get() == request; });
if(val != tracker->client_request.end()) if(val != tracker->client_request.end())
{ {

8
llarp/dnsd.cpp
Unescape Escape View File

@ -71,7 +71,7 @@ write404_dnss_response(const struct sockaddr *from,
put16bits(write_buffer, 1); // rdLength put16bits(write_buffer, 1); // rdLength
*write_buffer++ = 0; // write a null byte *write_buffer++ = 0; // write a null byte
uint out_bytes = write_buffer - bufferBegin; uint32_t out_bytes = write_buffer - bufferBegin;
llarp::LogDebug("Sending 404, ", out_bytes, " bytes"); llarp::LogDebug("Sending 404, ", out_bytes, " bytes");
// struct llarp_udp_io *udp = (struct llarp_udp_io *)request->user; // struct llarp_udp_io *udp = (struct llarp_udp_io *)request->user;
request->sendto_hook(request->user, from, buf, out_bytes); request->sendto_hook(request->user, from, buf, out_bytes);
@ -140,7 +140,7 @@ writecname_dnss_response(std::string cname, const struct sockaddr *from,
*write_buffer++ = 0; *write_buffer++ = 0;
*write_buffer++ = 1; *write_buffer++ = 1;
uint out_bytes = write_buffer - bufferBegin; uint32_t out_bytes = write_buffer - bufferBegin;
llarp::LogDebug("Sending cname, ", out_bytes, " bytes"); llarp::LogDebug("Sending cname, ", out_bytes, " bytes");
// struct llarp_udp_io *udp = (struct llarp_udp_io *)request->user; // struct llarp_udp_io *udp = (struct llarp_udp_io *)request->user;
request->sendto_hook(request->user, from, buf, out_bytes); request->sendto_hook(request->user, from, buf, out_bytes);
@ -180,7 +180,7 @@ writesend_dnss_revresponse(std::string reverse, const struct sockaddr *from,
put16bits(write_buffer, reverse.length() + 2); // rdLength put16bits(write_buffer, reverse.length() + 2); // rdLength
code_domain(write_buffer, reverse); code_domain(write_buffer, reverse);
uint out_bytes = write_buffer - bufferBegin; uint32_t out_bytes = write_buffer - bufferBegin;
llarp::LogDebug("Sending reverse: ", reverse, " ", out_bytes, " bytes"); llarp::LogDebug("Sending reverse: ", reverse, " ", out_bytes, " bytes");
// struct llarp_udp_io *udp = (struct llarp_udp_io *)request->user; // struct llarp_udp_io *udp = (struct llarp_udp_io *)request->user;
request->sendto_hook(request->user, from, buf, out_bytes); request->sendto_hook(request->user, from, buf, out_bytes);
@ -243,7 +243,7 @@ writesend_dnss_response(struct sockaddr *hostRes, const struct sockaddr *from,
*write_buffer++ = ip[2]; *write_buffer++ = ip[2];
*write_buffer++ = ip[3]; *write_buffer++ = ip[3];
uint out_bytes = write_buffer - bufferBegin; uint32_t out_bytes = write_buffer - bufferBegin;
llarp::LogDebug("Sending found, ", out_bytes, " bytes"); llarp::LogDebug("Sending found, ", out_bytes, " bytes");
// struct llarp_udp_io *udp = (struct llarp_udp_io *)request->user; // struct llarp_udp_io *udp = (struct llarp_udp_io *)request->user;
request->sendto_hook(request->user, from, buf, out_bytes); request->sendto_hook(request->user, from, buf, out_bytes);

37
llarp/ev_win32.hpp
Unescape Escape View File

@ -17,25 +17,17 @@ namespace llarp
// we receive queued data in the OVERLAPPED data field, // we receive queued data in the OVERLAPPED data field,
// much like the pipefds in the UNIX kqueue and loonix // much like the pipefds in the UNIX kqueue and loonix
// epoll handles // epoll handles
WSAOVERLAPPED portfd; WSAOVERLAPPED portfd[2];
size_t iosz;
udp_listener(SOCKET fd, llarp_udp_io* u) : ev_io(fd), udp(u) udp_listener(SOCKET fd, llarp_udp_io* u) : ev_io(fd), udp(u)
{ {
memset((void*)&portfd, 0, sizeof(WSAOVERLAPPED)); memset((void*)&portfd[0], 0, sizeof(WSAOVERLAPPED)*2);
}; };
~udp_listener() ~udp_listener()
{ {
} }
int
getData(void* buf, size_t sz, size_t ret)
{
iosz = ret;
return read(buf, sz);
}
virtual int virtual int
read(void* buf, size_t sz) read(void* buf, size_t sz)
{ {
@ -47,7 +39,7 @@ namespace llarp
// WSARecvFrom // WSARecvFrom
llarp::LogDebug("read ", sz, " bytes into socket"); llarp::LogDebug("read ", sz, " bytes into socket");
int ret = ::WSARecvFrom(std::get< SOCKET >(fd), &wbuf, 1, nullptr, &flags, int ret = ::WSARecvFrom(std::get< SOCKET >(fd), &wbuf, 1, nullptr, &flags,
addr, &slen, &portfd, nullptr); addr, &slen, &portfd[0], nullptr);
// 997 is the error code for queued ops // 997 is the error code for queued ops
int s_errno = ::WSAGetLastError(); int s_errno = ::WSAGetLastError();
if(ret && s_errno != 997) if(ret && s_errno != 997)
@ -55,8 +47,10 @@ namespace llarp
llarp::LogWarn("recv socket error ", s_errno); llarp::LogWarn("recv socket error ", s_errno);
return -1; return -1;
} }
// get the _real_ payload size from tick() /*if (sz > EV_READ_BUF_SZ)
udp->recvfrom(udp, addr, buf, iosz); return -1;*/
udp->recvfrom(udp, addr, buf, sz);
return 0; return 0;
} }
@ -79,7 +73,7 @@ namespace llarp
// WSASendTo // WSASendTo
llarp::LogDebug("write ", sz, " bytes into socket"); llarp::LogDebug("write ", sz, " bytes into socket");
ssize_t sent = ::WSASendTo(std::get< SOCKET >(fd), &wbuf, 1, nullptr, 0, ssize_t sent = ::WSASendTo(std::get< SOCKET >(fd), &wbuf, 1, nullptr, 0,
to, slen, &portfd, nullptr); to, slen, &portfd[1], nullptr);
int s_errno = ::WSAGetLastError(); int s_errno = ::WSAGetLastError();
if(sent && s_errno != 997) if(sent && s_errno != 997)
{ {
@ -94,7 +88,7 @@ namespace llarp
{ {
llarp_tun_io* t; llarp_tun_io* t;
device* tunif; device* tunif;
OVERLAPPED* tun_async; OVERLAPPED* tun_async[2];
tun(llarp_tun_io* tio) tun(llarp_tun_io* tio)
: ev_io(INVALID_HANDLE_VALUE) : ev_io(INVALID_HANDLE_VALUE)
, t(tio) , t(tio)
@ -123,7 +117,7 @@ namespace llarp
bool bool
do_write(void* data, size_t sz) do_write(void* data, size_t sz)
{ {
return WriteFile(std::get< HANDLE >(fd), data, sz, nullptr, tun_async); return WriteFile(std::get< HANDLE >(fd), data, sz, nullptr, tun_async[1]);
} }
int int
@ -159,7 +153,8 @@ namespace llarp
} }
fd = tunif->tun_fd; fd = tunif->tun_fd;
tun_async = &tunif->ovl; tun_async[0] = &tunif->ovl[0];
tun_async[1] = &tunif->ovl[1];
if(std::get< HANDLE >(fd) == INVALID_HANDLE_VALUE) if(std::get< HANDLE >(fd) == INVALID_HANDLE_VALUE)
return false; return false;
@ -222,7 +217,7 @@ struct llarp_win32_loop : public llarp_ev_loop
{ {
llarp::LogDebug("size: ", iolen, "\tev_id: ", ev_id, llarp::LogDebug("size: ", iolen, "\tev_id: ", ev_id,
"\tqdata: ", qdata); "\tqdata: ", qdata);
ev->getData(readbuf, sizeof(readbuf), iolen); ev->read(readbuf, iolen);
} }
++idx; ++idx;
} }
@ -262,7 +257,7 @@ struct llarp_win32_loop : public llarp_ev_loop
if(ev && !ev->fd.valueless_by_exception()) if(ev && !ev->fd.valueless_by_exception())
{ {
llarp::LogInfo("size: ", iolen, "\tev_id: ", ev_id, "\tqdata: ", qdata); llarp::LogInfo("size: ", iolen, "\tev_id: ", ev_id, "\tqdata: ", qdata);
ev->getData(readbuf, sizeof(readbuf), iolen); ev->read(readbuf, sizeof(readbuf));
} }
++idx; ++idx;
} }
@ -381,7 +376,7 @@ struct llarp_win32_loop : public llarp_ev_loop
return false; return false;
} }
::ReadFile((HANDLE)std::get< 0 >(ev->fd), &buf, 1024, nullptr, ::ReadFile((HANDLE)std::get< 0 >(ev->fd), &buf, 1024, nullptr,
&udp->portfd); &udp->portfd[0]);
break; break;
case 1: case 1:
t = dynamic_cast< llarp::tun* >(ev); t = dynamic_cast< llarp::tun* >(ev);
@ -391,7 +386,7 @@ struct llarp_win32_loop : public llarp_ev_loop
delete ev; delete ev;
return false; return false;
} }
::ReadFile(std::get< 1 >(ev->fd), &buf, 1024, nullptr, t->tun_async); ::ReadFile(std::get< 1 >(ev->fd), &buf, 1024, nullptr, t->tun_async[0]);
break; break;
default: default:
return false; return false;

2
llarp/router.cpp
Unescape Escape View File

@ -685,7 +685,7 @@ llarp_router::Run()
{ {
llarp::LogInfo("Found adapter for public address"); llarp::LogInfo("Found adapter for public address");
} }
if(!a.isPrivate()) if(!llarp::IsBogon(*a.addr6()))
{ {
llarp::LogInfo("Loading Addr: ", a, " into our RC"); llarp::LogInfo("Loading Addr: ", a, " into our RC");
_rc.addrs.push_back(addr); _rc.addrs.push_back(addr);

8
llarp/threadpool.cpp
Unescape Escape View File

@ -18,12 +18,6 @@
#include <llarp/linux/netns.hpp> #include <llarp/linux/netns.hpp>
#endif #endif
#ifdef _MSC_VER
#include <windows.h>
extern "C" void
SetThreadName(DWORD dwThreadID, LPCSTR szThreadName);
#endif
namespace llarp namespace llarp
{ {
namespace thread namespace thread
@ -43,8 +37,6 @@ namespace llarp
pthread_set_name_np(pthread_self(), name); pthread_set_name_np(pthread_self(), name);
#elif(__linux__) || (__MINGW32__) #elif(__linux__) || (__MINGW32__)
pthread_setname_np(pthread_self(), name); pthread_setname_np(pthread_self(), name);
#elif defined(_MSC_VER)
SetThreadName(GetCurrentThreadId(), name);
#endif #endif
} }
for(;;) for(;;)

4
vendor/libtuntap-master/tuntap-windows.c vendored
Unescape Escape View File

@ -394,7 +394,7 @@ tuntap_read(struct device *dev, void *buf, size_t size)
{ {
DWORD len; DWORD len;
if(ReadFile(dev->tun_fd, buf, (DWORD)size, &len, &dev->ovl) == 0) if(ReadFile(dev->tun_fd, buf, (DWORD)size, &len, &dev->ovl[0]) == 0)
{ {
int errcode = GetLastError(); int errcode = GetLastError();
@ -415,7 +415,7 @@ tuntap_write(struct device *dev, void *buf, size_t size)
{ {
DWORD len; DWORD len;
if(WriteFile(dev->tun_fd, buf, (DWORD)size, &len, &dev->ovl) == 0) if(WriteFile(dev->tun_fd, buf, (DWORD)size, &len, &dev->ovl[1]) == 0)
{ {
int errcode = GetLastError(); int errcode = GetLastError();

2
vendor/libtuntap-master/tuntap.cpp vendored
Unescape Escape View File

@ -69,7 +69,7 @@ extern "C"
dev->ctrl_sock = -1; dev->ctrl_sock = -1;
dev->flags = 0; dev->flags = 0;
#if defined(Windows) #if defined(Windows)
memset(&dev->ovl, 0, sizeof(OVERLAPPED)); memset(&dev->ovl[0], 0, sizeof(OVERLAPPED)*2);
#endif #endif
__tuntap_log = &tuntap_log_default; __tuntap_log = &tuntap_log_default;

Write Preview
Loading…
Cancel
Save