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

Officially deprecated old Makefile in favor of CMake

Browse Source
This commit is contained in:
Joseph Henry
2017-12-15 16:26:27 -08:00
parent 0a7bdd5f8f
commit 8ec82b026a
5 changed files with 85 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/VirtualTap.cpp
View File

@@ -81,7 +81,7 @@ VirtualTap::VirtualTap(
// set virtual tap interface name (full)
memset(vtap_full_name, 0, sizeof(vtap_full_name));
ifindex = devno;
snprintf(vtap_full_name, sizeof(vtap_full_name), "libzt%d-%lx", devno++, _nwid);
snprintf(vtap_full_name, sizeof(vtap_full_name), "libzt%d-%llx", devno++, _nwid);
_dev = vtap_full_name;
DEBUG_INFO("set VirtualTap interface name to: %s", _dev.c_str());
// set virtual tap interface name (abbreviated)
@@ -193,7 +193,7 @@ std::string VirtualTap::nodeId() const
if (zt1ServiceRef) {
char id[ZTO_ID_LEN];
memset(id, 0, sizeof(id));
sprintf(id, "%lx",((ZeroTier::OneService *)zt1ServiceRef)->getNode()->address());
sprintf(id, "%llx",((ZeroTier::OneService *)zt1ServiceRef)->getNode()->address());
return std::string(id);
}
else {