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

Updated lwip.patch for Linux compatibility, CMakeLists.txt, and fixed other minor compile-time warnings

Browse Source
This commit is contained in:
Joseph Henry
2018-07-27 09:53:08 -07:00
parent 6fec662150
commit 6e086ed3fa
8 changed files with 91 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZT1Service.cpp
View File

@@ -93,7 +93,7 @@ VirtualTap *getTapByAddr(ZeroTier::InetAddress *addr)
for (size_t i=0; i<vtaps.size(); i++) {
s = (VirtualTap*)vtaps[i];
// check address schemes
for (ssize_t j=0; j<s->_ips.size(); j++) {
for (int j=0; j<(int)(s->_ips.size()); j++) {
if ((s->_ips[j].isV4() && addr->isV4()) || (s->_ips[j].isV6() && addr->isV6())) {
/* DEBUG_EXTRA("looking at tap %s, <addr=%s> --- for <%s>", s->_dev.c_str(),
s->_ips[j].toString(ipbuf), addr->toIpString(ipbuf2)); */
@@ -283,7 +283,7 @@ int zts_get_address_at_index(
return err;
}
_vtaps_lock.lock();
if (index > -1 && index <= tap->_ips.size()) {
if (index > -1 && index <= (int)tap->_ips.size()) {
memcpy(addr, &(tap->_ips[index]), *addrlen);
*addrlen = tap->_ips[index].isV4() ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
err = 0;

2
src/libzt.cpp
View File

@@ -420,7 +420,7 @@ int platform_adjusted_socket_family(int family)
if (family == 2) {
return AF_INET;
}
family; // 10
return -1;
#endif
}