Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-19 09:25:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102 from michael-loki/build_fixes

Browse Source 
Minor build fixes
This commit is contained in:
Jeff 2018-12-05 08:56:36 -05:00 committed by GitHub
commit 33a4ac8b69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llarp/handlers/tun.hpp
View File

@ -24,10 +24,10 @@ namespace llarp
~TunEndpoint(); ~TunEndpoint();
virtual bool virtual bool
SetOption(const std::string& k, const std::string& v); SetOption(const std::string& k, const std::string& v) override;
virtual void virtual void
Tick(llarp_time_t now); Tick(llarp_time_t now) override;
void void
TickTun(llarp_time_t now); TickTun(llarp_time_t now);
@ -36,7 +36,7 @@ namespace llarp
MapAddress(const service::Address& remote, huint32_t ip, bool SNode); MapAddress(const service::Address& remote, huint32_t ip, bool SNode);
bool bool
Start(); Start() override;
bool bool
IsSNode() const; IsSNode() const;
@ -47,7 +47,7 @@ namespace llarp
/// overrides Endpoint /// overrides Endpoint
bool bool
SetupNetworking(); SetupNetworking() override;
/// overrides Endpoint /// overrides Endpoint
/// handle inbound traffic /// handle inbound traffic
@ -69,7 +69,7 @@ namespace llarp
#ifndef WIN32 #ifndef WIN32
/// overrides Endpoint /// overrides Endpoint
bool bool
IsolationFailed() IsolationFailed() override
{ {
m_TunSetupResult.set_value(false); m_TunSetupResult.set_value(false);
return false; return false;

6
llarp/ev.hpp
View File

@ -25,6 +25,12 @@ struct asio_evt_pkt
size_t sz; // if this doesn't match what is in the packet, note the error size_t sz; // if this doesn't match what is in the packet, note the error
}; };
#else #else
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
|| (__APPLE__ && __MACH__)
#include <sys/event.h>
#endif
#include <sys/un.h> #include <sys/un.h>
#endif #endif