gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some debug trace format specifiers to reduce compile-time warnings (round two)

Browse Source
This commit is contained in:
Joseph Henry
2018-02-21 12:02:16 -08:00
parent 9fba2a6d32
commit c107f2c05c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bindings/cpp/ipv6adhoc/ipv6adhocserver.cpp
View File

@@ -79,7 +79,7 @@ int main(int argc, char **argv)
in6.sin6_family = AF_INET6; in6.sin6_family = AF_INET6;
in6.sin6_addr = in6addr_any; in6.sin6_addr = in6addr_any;
fprintf(stderr, "nwid=%llx\n", nwid); fprintf(stderr, "nwid=%llx\n", (unsigned long long)nwid);
exit(-1); exit(-1);
// --- BEGIN EXAMPLE CODE // --- BEGIN EXAMPLE CODE

4
src/VirtualTap.cpp
View File

@@ -135,7 +135,7 @@ bool VirtualTap::addIp(const InetAddress &ip)
#endif #endif
#if defined(STACK_PICO) || defined(STACK_LWIP) #if defined(STACK_PICO) || defined(STACK_LWIP)
char ipbuf[INET6_ADDRSTRLEN]; 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); Mutex::Lock _l(_ips_m);
if (registerIpWithStack(ip)) { if (registerIpWithStack(ip)) {
if (std::find(_ips.begin(),_ips.end(),ip) == _ips.end()) { if (std::find(_ips.begin(),_ips.end(),ip) == _ips.end()) {
@@ -193,7 +193,7 @@ std::string VirtualTap::nodeId() const
if (zt1ServiceRef) { if (zt1ServiceRef) {
char id[ZTO_ID_LEN]; char id[ZTO_ID_LEN];
memset(id, 0, sizeof(id)); 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); return std::string(id);
} }
else { else {

4
src/libzt.cpp
View File

@@ -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) 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) { if (zts_ready() == false) {
DEBUG_ERROR("service not started yet, call zts_startjoin()"); DEBUG_ERROR("service not started yet, call zts_startjoin()");
return -1; 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, ssize_t zts_recvfrom(int fd, void *buf, size_t len, int flags,
struct sockaddr *addr, socklen_t *addrlen) 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) { if (zts_ready() == false) {
DEBUG_ERROR("service not started yet, call zts_startjoin()"); DEBUG_ERROR("service not started yet, call zts_startjoin()");
return -1; return -1;

8
test/selftest.cpp
View File

@@ -230,8 +230,8 @@ inline unsigned int gettid()
#define _READ read #define _READ read
#define _WRITE write #define _WRITE write
#define _RECV recv //#define _RECV recv
#define _SEND send //#define _SEND send
#if defined(_WIN32) #if defined(_WIN32)
#define _CLOSE closesocket #define _CLOSE closesocket
@@ -2895,7 +2895,7 @@ int main(int argc , char *argv[])
zts_start(argv[3], true); zts_start(argv[3], true);
zts_join(nwid); zts_join(nwid);
sleep(2); sleep(2);
DEBUG_TEST("generated id: %llx", nodeId); DEBUG_TEST("generated id: %llx", (unsigned long long)nodeId);
exit(0); exit(0);
} }
} }
@@ -2985,7 +2985,7 @@ int main(int argc , char *argv[])
} }
zts_startjoin(path.c_str(), nwid); zts_startjoin(path.c_str(), nwid);
uint64_t nodeId = zts_get_node_id(); 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) { if (mode == TEST_MODE_SERVER) {
DEBUG_TEST("Ready. You should start selftest program on second host now...\n\n"); DEBUG_TEST("Ready. You should start selftest program on second host now...\n\n");
} }