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

formatting adjustments

Browse Source
This commit is contained in:
Joseph Henry
2017-11-09 12:48:51 -08:00
parent ab6eb57da6
commit e05070a8c2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZT1Service.cpp
View File

@@ -268,7 +268,7 @@ void *zts_start_service(void *thread_id)
void zts_get_address(const uint64_t nwid, struct sockaddr_storage *addr, const size_t addrlen) void zts_get_address(const uint64_t nwid, struct sockaddr_storage *addr, const size_t addrlen)
{ {
if(!zt1Service) { if (!zt1Service) {
return; return;
} }
VirtualTap *tap = getTapByNWID(nwid); VirtualTap *tap = getTapByNWID(nwid);

12
src/libztJNI.cpp
View File

@@ -208,11 +208,11 @@ namespace ZeroTier {
return -1; return -1;
} }
inetaddr = (*env).CallObjectMethod(addr, getAddress); inetaddr = (*env).CallObjectMethod(addr, getAddress);
if(!inetaddr) { if (!inetaddr) {
return -1; return -1;
} }
jclass inetClass = (*env).GetObjectClass(inetaddr); jclass inetClass = (*env).GetObjectClass(inetaddr);
if(!inetClass) { if (!inetClass) {
return -1; return -1;
} }
// string representation of IP address // string representation of IP address
@@ -221,24 +221,24 @@ namespace ZeroTier {
const char *addr_str = (*env).GetStringUTFChars(addrstr, NULL); const char *addr_str = (*env).GetStringUTFChars(addrstr, NULL);
DEBUG_INFO("addr_str=%s", addr_str); DEBUG_INFO("addr_str=%s", addr_str);
for (int i=0; i<strlen(addr_str); i++) { for (int i=0; i<strlen(addr_str); i++) {
if(addr_str[i]=='.') { if (addr_str[i]=='.') {
DEBUG_INFO("ipv4, inet_addr"); DEBUG_INFO("ipv4, inet_addr");
socket_family = AF_INET; socket_family = AF_INET;
in4->sin_family = AF_INET; in4->sin_family = AF_INET;
in4->sin_port = htons(port); in4->sin_port = htons(port);
in4->sin_addr.s_addr = inet_addr(addr_str); in4->sin_addr.s_addr = inet_addr(addr_str);
/* /*
if(!inet_pton(AF_INET, addr_str, &(in4->sin_addr))) { if (!inet_pton(AF_INET, addr_str, &(in4->sin_addr))) {
DEBUG_ERROR("error converting address %s", addr_str); DEBUG_ERROR("error converting address %s", addr_str);
} }
*/ */
addrlen = sizeof(struct sockaddr_in); addrlen = sizeof(struct sockaddr_in);
break; break;
} }
if(addr_str[i]==':') { if (addr_str[i]==':') {
DEBUG_INFO("ipv6"); DEBUG_INFO("ipv6");
socket_family = AF_INET6; socket_family = AF_INET6;
if(!inet_pton(AF_INET6, addr_str, &(in6->sin6_addr))) { if (!inet_pton(AF_INET6, addr_str, &(in6->sin6_addr))) {
DEBUG_ERROR("error converting address %s", addr_str); DEBUG_ERROR("error converting address %s", addr_str);
} }
addrlen = sizeof(struct sockaddr_in6); addrlen = sizeof(struct sockaddr_in6);