fix osx build

include/llarp/ip.hpp

@@ -44,6 +44,12 @@ typedef struct ip_hdr
 #define iphdr ip
 #define saddr ip_src.s_addr
 #define daddr ip_dst.s_addr
+#define ip_version ip_v
+#define check ip_sum
+#define ihl ip_hl
+#endif
+#if defined(__linux__)
+#define ip_version version
 #endif
 
 namespace llarp

llarp/handlers/tun.cpp

@@ -329,7 +329,7 @@ namespace llarp
       if(!self->m_UserToNetworkPktQueue.EmplaceIf(
              [self, buf, sz](net::IPv4Packet *pkt) -> bool {
                return pkt->Load(llarp::InitBuffer(buf, sz))
-                   && pkt->Header()->version == 4;
+                   && pkt->Header()->ip_version == 4;
              }))
         llarp::LogError("Failed to parse ipv4 packet");
     }

llarp/ip.cpp

@@ -10,7 +10,11 @@ namespace llarp
     bool
     IPv4Packet::Load(llarp_buffer_t pkt)
     {
-      sz = std::min(pkt.sz, sizeof(buf));
+#ifndef MIN
+#define MIN(a, b) (a < b ? a : b)
+      sz = MIN(pkt.sz, sizeof(buf));
+#undef MIN
+#endif
       memcpy(buf, pkt.base, sz);
       llarp::DumpBufferHex(pkt);
       return true;

llarp/service/endpoint.cpp

@@ -566,7 +566,8 @@ namespace llarp
       if(m_RemoteSessions.find(addr) == m_RemoteSessions.end())
       {
         OutboundContext* ctx = new OutboundContext(introset, this);
-        m_RemoteSessions.insert(std::make_pair(addr, ctx));
+        m_RemoteSessions.insert(
+            std::make_pair(addr, std::unique_ptr< OutboundContext >(ctx)));
         llarp::LogInfo("Created New outbound context for ", addr.ToString());
       }