From c107f2c05c9dd66a4c93e16b3317936995975b27 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Wed, 21 Feb 2018 12:02:16 -0800
Subject: [PATCH] Fixed some debug trace format specifiers to reduce
 compile-time warnings (round two)

---
 examples/bindings/cpp/ipv6adhoc/ipv6adhocserver.cpp | 2 +-
 src/VirtualTap.cpp                                  | 4 ++--
 src/libzt.cpp                                       | 4 ++--
 test/selftest.cpp                                   | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/bindings/cpp/ipv6adhoc/ipv6adhocserver.cpp b/examples/bindings/cpp/ipv6adhoc/ipv6adhocserver.cpp
index eed1930..5892b07 100644
--- a/examples/bindings/cpp/ipv6adhoc/ipv6adhocserver.cpp
+++ b/examples/bindings/cpp/ipv6adhoc/ipv6adhocserver.cpp
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
 	in6.sin6_family = AF_INET6;
 	in6.sin6_addr = in6addr_any;
 
-	fprintf(stderr, "nwid=%llx\n", nwid);
+	fprintf(stderr, "nwid=%llx\n", (unsigned long long)nwid);
 	exit(-1);
 
 	// --- BEGIN EXAMPLE CODE
diff --git a/src/VirtualTap.cpp b/src/VirtualTap.cpp
index 0c8efec..11817ad 100644
--- a/src/VirtualTap.cpp
+++ b/src/VirtualTap.cpp
@@ -135,7 +135,7 @@ bool VirtualTap::addIp(const InetAddress &ip)
 #endif
 #if defined(STACK_PICO) || defined(STACK_LWIP)
 	char ipbuf[INET6_ADDRSTRLEN];
-	DEBUG_EXTRA("addr=%s, nwid=%llx", ip.toString(ipbuf), _nwid);
+	DEBUG_EXTRA("addr=%s, nwid=%llx", ip.toString(ipbuf), (unsigned long long)_nwid);
 	Mutex::Lock _l(_ips_m);
 	if (registerIpWithStack(ip)) {
 		if (std::find(_ips.begin(),_ips.end(),ip) == _ips.end()) {
@@ -193,7 +193,7 @@ std::string VirtualTap::nodeId() const
 	if (zt1ServiceRef) {
 		char id[ZTO_ID_LEN];
 		memset(id, 0, sizeof(id));
-		sprintf(id, "%llx",((ZeroTier::OneService *)zt1ServiceRef)->getNode()->address());
+		sprintf(id, "%llx", (unsigned long long)((ZeroTier::OneService *)zt1ServiceRef)->getNode()->address());
 		return std::string(id);
 	}
 	else {
diff --git a/src/libzt.cpp b/src/libzt.cpp
index ecffd92..6272d61 100644
--- a/src/libzt.cpp
+++ b/src/libzt.cpp
@@ -500,7 +500,7 @@ ssize_t zts_sendmsg(int fd, const struct msghdr *msg, int flags)
 
 ssize_t zts_recv(int fd, void *buf, size_t len, int flags)
 {
-	DEBUG_TRANS("fd=%d, len=%zu", fd);
+	DEBUG_TRANS("fd=%d, len=%zu", fd, len);
 	if (zts_ready() == false) {
 		DEBUG_ERROR("service not started yet, call zts_startjoin()");
 		return -1;
@@ -519,7 +519,7 @@ ssize_t zts_recv(int fd, void *buf, size_t len, int flags)
 ssize_t zts_recvfrom(int fd, void *buf, size_t len, int flags,
 	struct sockaddr *addr, socklen_t *addrlen)
 {
-	DEBUG_TRANS("fd=%d, len=%zu", fd);
+	DEBUG_TRANS("fd=%d, len=%zu", fd, len);
 	if (zts_ready() == false) {
 		DEBUG_ERROR("service not started yet, call zts_startjoin()");
 		return -1;
diff --git a/test/selftest.cpp b/test/selftest.cpp
index 3161330..9e1af51 100644
--- a/test/selftest.cpp
+++ b/test/selftest.cpp
@@ -230,8 +230,8 @@ inline unsigned int gettid()
 #define _READ read
 #define _WRITE write
 
-#define _RECV recv
-#define _SEND send
+//#define _RECV recv
+//#define _SEND send
 
 #if defined(_WIN32)
 #define _CLOSE closesocket
@@ -2895,7 +2895,7 @@ int main(int argc , char *argv[])
 			zts_start(argv[3], true);
 			zts_join(nwid);
 			sleep(2);
-			DEBUG_TEST("generated id: %llx", nodeId);
+			DEBUG_TEST("generated id: %llx", (unsigned long long)nodeId);
 			exit(0);
 		}
 	}
@@ -2985,7 +2985,7 @@ int main(int argc , char *argv[])
 		}
 		zts_startjoin(path.c_str(), nwid);
 		uint64_t nodeId = zts_get_node_id();
-		DEBUG_TEST("I am %llx, %s", nodeId, me.c_str());
+		DEBUG_TEST("I am %llx, %s", (unsigned long long)nodeId, me.c_str());
 		if (mode == TEST_MODE_SERVER) {
 			DEBUG_TEST("Ready. You should start selftest program on second host now...\n\n");
 		}