ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-03-10 22:44:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Grant Limberg 2018-10-24 12:08:48 -07:00
commit f901b9dd6b
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node/InetAddress.cpp
View File

@ -142,11 +142,19 @@ char *InetAddress::toIpString(char buf[64]) const
buf[0] = (char)0; buf[0] = (char)0;
switch(ss_family) { switch(ss_family) {
case AF_INET: { case AF_INET: {
#ifdef _WIN32
inet_ntop(AF_INET, (void*)&reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr, buf, INET_ADDRSTRLEN);
#else
inet_ntop(AF_INET, &reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr, buf, INET_ADDRSTRLEN); inet_ntop(AF_INET, &reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr, buf, INET_ADDRSTRLEN);
#endif
} break; } break;
case AF_INET6: { case AF_INET6: {
#ifdef _WIN32
inet_ntop(AF_INET6, (void*)reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr, buf, INET6_ADDRSTRLEN);
#else
inet_ntop(AF_INET6, reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr, buf, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr, buf, INET6_ADDRSTRLEN);
#endif
} break; } break;
} }
return buf; return buf;

11
one.cpp
View File

@ -630,13 +630,9 @@ static int cli(int argc,char **argv)
} }
} else if (command == "get") { } else if (command == "get") {
if (arg1.length() != 16) { if (arg1.length() != 16) {
cliPrintHelp(argv[0],stderr); fprintf(stderr,"invalid network ID format, must be a 16-digit hexidecimal number\n");
return 2; return 2;
} }
char jsons[1024], cl[128];
OSUtils::ztsnprintf(cl,sizeof(cl),"%u",(unsigned int)strlen(jsons));
requestHeaders["Content-Type"] = "application/json";
requestHeaders["Content-Length"] = cl;
const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/network",requestHeaders,responseHeaders,responseBody); const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/network",requestHeaders,responseHeaders,responseBody);
if (scode == 0) { if (scode == 0) {
@ -654,16 +650,21 @@ static int cli(int argc,char **argv)
printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str()); printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
return 1; return 1;
} }
bool bNetworkFound = false;
if (j.is_array()) { if (j.is_array()) {
for(unsigned long i=0;i<j.size();++i) { for(unsigned long i=0;i<j.size();++i) {
nlohmann::json &n = j[i]; nlohmann::json &n = j[i];
if (n.is_object()) { if (n.is_object()) {
if (n["id"] == arg1) { if (n["id"] == arg1) {
printf("%s\n", OSUtils::jsonString(n[arg2],"-").c_str()); printf("%s\n", OSUtils::jsonString(n[arg2],"-").c_str());
bNetworkFound = true;
} }
} }
} }
} }
if (!bNetworkFound) {
fprintf(stderr,"unknown network ID, check that you are a member of the network\n");
}
if (scode == 200) { if (scode == 200) {
return 0; return 0;
} else { } else {

2
service/OneService.cpp
View File

@ -67,7 +67,7 @@
#include <ShlObj.h> #include <ShlObj.h>
#include <netioapi.h> #include <netioapi.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#include <unistd.h> //#include <unistd.h>
#define stat _stat #define stat _stat
#else #else
#include <sys/types.h> #include <sys/types.h>