Merge remote-tracking branch 'rick/dev' into dev

pull/66/head
Jeff Becker 6 years ago
commit 1fc8db83ca
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -52,6 +52,7 @@ endif()
if(WIN32)
add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wno-bad-function-cast>)
add_compile_options(-Wno-cast-function-type)
set(FS_LIB stdc++fs)
endif(WIN32)

@ -299,7 +299,7 @@ generic_handle_dnsc_recvfrom(dnsc_answer_request *request,
llarp::LogDebug("Read an authority for ",
request->question.name, " at ", std::to_string(pos));
// castBuf += answer->name.length() + 4 + 4 + 4 + answer->rdLen;
if(pos > sz)
if((ssize_t)pos > sz)
{
llarp::LogWarn("Would read past end of dns packet. for ",
request->question.name);

@ -248,7 +248,6 @@ namespace llarp
setup()
{
llarp::LogDebug("set ifname to ", t->ifname);
strncpy(tunif->if_name, t->ifname, IFNAMSIZ);
if(tuntap_start(tunif, TUNTAP_MODE_TUNNEL, 0) == -1)
{

Loading…
Cancel
Save