Merge remote-tracking branch 'rick/dev'

CMakeLists.txt

@@ -34,6 +34,8 @@ add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fpermissive>)
 add_compile_options(-Wno-unused-function -Wno-deprecated-declarations -Wno-unknown-pragmas)
 
 if (WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE)
+# dynamic linking does this all the time
+add_compile_options(-Wno-cast-function-type)
 if (USING_CLANG)
 add_compile_options(-Wno-unused-command-line-argument -Wno-c++11-narrowing)
 # because clang is insane enough to inline whole sections of the C++ library!

crypto/libntrup/src/avx/dec.c

@@ -68,9 +68,9 @@ crypto_kem_dec_avx2(unsigned char *k, const unsigned char *cstr,
     k[i] = (hash[32 + i] & ~result);
   return result;
 #else
-  (void)k;
-  (void)cstr;
-  (void)sk;
+  (void)(k);
+  (void)(sk);
+  (void)(cstr);
   return -1;
 #endif
 }

crypto/libntrup/src/avx/enc.c

@@ -47,9 +47,9 @@ crypto_kem_enc_avx2(unsigned char *cstr, unsigned char *k,
 
   return 0;
 #else
-  (void)pk;
-  (void)k;
-  (void)cstr;
+  (void)(cstr);
+  (void)(k);
+  (void)(pk);
   return -1;
 #endif
 }

crypto/libntrup/src/avx/keypair.c

@@ -40,8 +40,8 @@ crypto_kem_keypair_avx2(unsigned char *pk, unsigned char *sk)
 
   return 0;
 #else
-  (void)pk;
-  (void)sk;
+  (void)(pk);
+  (void)(sk);
   return -1;
 #endif
 }

libutp/utp_packedsockaddr.cpp

@@ -62,8 +62,9 @@ uint32 PackedSockAddr::compute_hash() const {
 
 void PackedSockAddr::set(const SOCKADDR_STORAGE* sa, socklen_t len)
 {
+	// on unix, the cast does nothing, socklen_t is _already_ unsigned
 	if (sa->ss_family == AF_INET) {
-		assert(len >= sizeof(sockaddr_in));
+		assert((unsigned)len >= sizeof(sockaddr_in));
 		const sockaddr_in *sin = (sockaddr_in*)sa;
 		_sin6w[0] = 0;
 		_sin6w[1] = 0;
@@ -74,7 +75,7 @@ void PackedSockAddr::set(const SOCKADDR_STORAGE* sa, socklen_t len)
 		_sin4 = sin->sin_addr.s_addr;
 		_port = ntohs(sin->sin_port);
 	} else {
-		assert(len >= sizeof(sockaddr_in6));
+		assert((unsigned)len >= sizeof(sockaddr_in6));
 		const sockaddr_in6 *sin6 = (sockaddr_in6*)sa;
 		_in._in6addr = sin6->sin6_addr;
 		_port = ntohs(sin6->sin6_port);

libutp/utp_utils.cpp

@@ -166,9 +166,13 @@ __GetMicroseconds()
 
 #else  // !__APPLE__
 
-#if !(defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 && defined(CLOCK_MONOTONIC))
+// While _POSIX_TIMERS == -1 in openbsd, clock_gettime(2) _does_ support monotonic.
+// this is true for all the BSDs
+#if !(__OpenBSD__ || __NetBSD__ || __FreeBSD__)
+#if !(defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 && defined(CLOCK_MONOTONIC)) 
 #warning "Using non-monotonic function gettimeofday() in UTP_GetMicroseconds()"
 #endif
+#endif
 
 /* Unfortunately, #ifdef CLOCK_MONOTONIC is not enough to make sure that
    POSIX clocks work -- we could be running a recent libc with an ancient
@@ -179,7 +183,7 @@ __GetMicroseconds()
 {
   struct timeval tv;
 
-#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 && defined(CLOCK_MONOTONIC)
+#if defined(CLOCK_MONOTONIC)
   static int have_posix_clocks = -1;
   int rc;
 

llarp/dnsc.cpp

@@ -282,7 +282,7 @@ generic_handle_dnsc_recvfrom(dnsc_answer_request *request,
       break;
     }
     */
-    if(ssize_t(pos) > sz)
+    if(pos > (size_t)sz)
     {
       llarp::LogWarn("Would read past end of dns packet. for ",
                      request->question.name);
@@ -519,7 +519,7 @@ raw_resolve_host(struct dnsc_context *const dnsc, const char *url,
 #endif
 
   sockfd = socket(AF_INET, SOCK_DGRAM, 0);
-  if(sockfd < 0)
+  if(!(sockfd > 0))
   {
     llarp::LogWarn("Error creating socket!\n");
     return;

llarp/ev.hpp

@@ -124,6 +124,9 @@ namespace llarp
     virtual int
     sendto(const sockaddr* dst, const void* data, size_t sz)
     {
+      (void)(dst);
+      (void)(data);
+      (void)(sz);
       return -1;
     };
 

llarp/ev_win32.hpp

@@ -196,6 +196,9 @@ namespace llarp
     int
     sendto(const sockaddr* to, const void* data, size_t sz)
     {
+      (void)(to);
+      (void)(data);
+      (void)(sz);
       return -1;
     }
 

llarp/win32_inet.c

@@ -119,6 +119,7 @@ _GetAdaptersAddresses(ULONG Family, ULONG Flags, PVOID Reserved,
   PUCHAR currentLocation;
   HANDLE tcpFile;
 
+  (void)(Family);
   if(!pOutBufLen)
     return ERROR_INVALID_PARAMETER;
   if(Reserved)
@@ -258,7 +259,7 @@ _GetAdaptersAddresses(ULONG Family, ULONG Flags, PVOID Reserved,
         currentAddress->FirstUnicastAddress->PrefixOrigin =
             IpPrefixOriginOther;  // FIXME
         currentAddress->FirstUnicastAddress->SuffixOrigin =
-            IpPrefixOriginOther;  // FIXME
+            IpSuffixOriginOther;  // FIXME
         currentAddress->FirstUnicastAddress->DadState =
             IpDadStatePreferred;  // FIXME
         currentAddress->FirstUnicastAddress->ValidLifetime =
@@ -311,4 +312,4 @@ _GetAdaptersAddresses(ULONG Family, ULONG Flags, PVOID Reserved,
 
   return NO_ERROR;
 }
-#endif
+#endif

llarp/win32_intrnl.c

@@ -49,7 +49,7 @@ NTSTATUS
 tdiGetMibForIfEntity(HANDLE tcpFile, TDIEntityID *ent,
                      IFEntrySafelySized *entry)
 {
-  TCP_REQUEST_QUERY_INFORMATION_EX req = {{{0}}};
+  TCP_REQUEST_QUERY_INFORMATION_EX req;
   NTSTATUS status                      = 0;
   DWORD returnSize;
 
@@ -58,6 +58,7 @@ tdiGetMibForIfEntity(HANDLE tcpFile, TDIEntityID *ent,
           (int)tcpFile, (int)ent->tei_instance);
 #endif
 
+  memset(&req, 0, sizeof(req));
   req.ID.toi_class  = INFO_CLASS_PROTOCOL;
   req.ID.toi_type   = INFO_TYPE_PROVIDER;
   req.ID.toi_id     = 1;
@@ -99,12 +100,13 @@ tdiGetSetOfThings(HANDLE tcpFile, DWORD toiClass, DWORD toiType, DWORD toiId,
                   DWORD teiEntity, DWORD teiInstance, DWORD fixedPart,
                   DWORD entrySize, PVOID *tdiEntitySet, PDWORD numEntries)
 {
-  TCP_REQUEST_QUERY_INFORMATION_EX req = {{{0}}};
+  TCP_REQUEST_QUERY_INFORMATION_EX req;
   PVOID entitySet                      = 0;
   NTSTATUS status                      = 0;
   DWORD allocationSizeForEntityArray   = entrySize * MAX_TDI_ENTITIES,
         arraySize                      = entrySize * MAX_TDI_ENTITIES;
 
+  memset(&req, 0, sizeof(req));
   req.ID.toi_class               = toiClass;
   req.ID.toi_type                = toiType;
   req.ID.toi_id                  = toiId;
@@ -245,6 +247,7 @@ isLoopback(HANDLE tcpFile, TDIEntityID *loop_maybe)
 BOOL
 isIpEntity(HANDLE tcpFile, TDIEntityID *ent)
 {
+  UNREFERENCED_PARAMETER(tcpFile);
   return (ent->tei_entity == CL_NL_ENTITY || ent->tei_entity == CO_NL_ENTITY);
 }
 
@@ -255,7 +258,7 @@ getNthIpEntity(HANDLE tcpFile, DWORD index, TDIEntityID *ent)
   DWORD numRoutes        = 0;
   TDIEntityID *entitySet = 0;
   NTSTATUS status        = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
-  int i;
+  unsigned i;
 
   if(!NT_SUCCESS(status))
     return status;
@@ -300,7 +303,8 @@ getInterfaceInfoSet(HANDLE tcpFile, IFInfo **infoSet, PDWORD numInterfaces)
   TDIEntityID *entIDSet = NULL;
   NTSTATUS status       = tdiGetEntityIDSet(tcpFile, &entIDSet, &numEntities);
   IFInfo *infoSetInt    = 0;
-  int curInterf         = 0, i;
+  int curInterf         = 0;
+  unsigned i;
 
   if(!NT_SUCCESS(status))
   {
@@ -326,7 +330,7 @@ getInterfaceInfoSet(HANDLE tcpFile, IFInfo **infoSet, PDWORD numInterfaces)
           DWORD numAddrs;
           IPAddrEntry *addrs;
           TDIEntityID ip_ent;
-          int j;
+          unsigned j;
 
           status = getNthIpEntity(tcpFile, curInterf, &ip_ent);
           if(NT_SUCCESS(status))
@@ -377,7 +381,7 @@ getInterfaceInfoByName(HANDLE tcpFile, char *name, IFInfo *info)
 {
   IFInfo *ifInfo;
   DWORD numInterfaces;
-  int i;
+  unsigned i;
   NTSTATUS status = getInterfaceInfoSet(tcpFile, &ifInfo, &numInterfaces);
 
   if(NT_SUCCESS(status))
@@ -405,7 +409,7 @@ getInterfaceInfoByIndex(HANDLE tcpFile, DWORD index, IFInfo *info)
   IFInfo *ifInfo;
   DWORD numInterfaces;
   NTSTATUS status = getInterfaceInfoSet(tcpFile, &ifInfo, &numInterfaces);
-  int i;
+  unsigned i;
 
   if(NT_SUCCESS(status))
   {
@@ -444,7 +448,7 @@ InterfaceIndexTable *
 getInterfaceIndexTableInt(BOOL nonLoopbackOnly)
 {
   DWORD numInterfaces, curInterface = 0;
-  int i;
+  unsigned i;
   IFInfo *ifInfo;
   InterfaceIndexTable *ret = 0;
   HANDLE tcpFile;
@@ -565,4 +569,4 @@ SetThreadName(DWORD dwThreadID, LPCSTR szThreadName)
   if(hThread)
     CloseHandle(hThread);
 }
-#endif
+#endif

vendor/libtuntap-master/tuntap-windows.c

@@ -174,6 +174,7 @@ tuntap_start(struct device *dev, int mode, int tun)
   HANDLE tun_fd;
   char *deviceid;
   char buf[60];
+  (void)(tun);
 
   /* put something in there to avoid problems (uninitialised field access) */
   tun_fd   = TUNFD_INVALID_VALUE;
@@ -256,6 +257,8 @@ tuntap_get_hwaddr(struct device *dev)
 int
 tuntap_set_hwaddr(struct device *dev, const char *hwaddr)
 {
+  (void)(hwaddr);
+  (void)(dev);
   tuntap_log(TUNTAP_LOG_NOTICE,
              "Your system does not support tuntap_set_hwaddr()");
   return -1;

vendor/libtuntap-master/tuntap_log.cpp

@@ -83,8 +83,8 @@ extern "C"
       if(n % 16 == 1)
       {
         /* store address for this line */
-        snprintf(addrstr, sizeof(addrstr), "%.4zu",
-                 ((uintptr_t)p - (uintptr_t)data));
+        snprintf(addrstr, sizeof(addrstr), "%p",
+                 (void *)((uintptr_t)p - (uintptr_t)data));
       }
 
       c = *p;
@@ -155,4 +155,4 @@ extern "C"
     (void)snprintf(buf, sizeof buf, "Checksum of this block: %0#4x", sum);
     tuntap_log(TUNTAP_LOG_NONE, buf);
   }
-}
+}