void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli work...

Browse source
This commit is contained in:
Adam Ierymenko 2016-06-23 17:00:33 -07:00
parent 32d9850263
commit a5a05e454e
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cli/zerotier.cpp
View file

@ -159,9 +159,9 @@ static size_t _curlStringAppendCallback(void *contents,size_t size,size_t nmemb,
static std::tuple<int,std::string> GET(const CLIState &state,const std::map<std::string,std::string> &headers,const std::string &url) static std::tuple<int,std::string> GET(const CLIState &state,const std::map<std::string,std::string> &headers,const std::string &url)
{ {
int status = -1;
std::string body; std::string body;
char errbuf[CURL_ERROR_SIZE]; char errbuf[CURL_ERROR_SIZE];
char urlbuf[4096];
CURL *curl = curl_easy_init(); CURL *curl = curl_easy_init();
if (!curl) { if (!curl) {
@ -174,6 +174,20 @@ static std::tuple<int,std::string> GET(const CLIState &state,const std::map<std:
curl_easy_setopt(curl,CURLOPT_USERAGENT,"ZeroTier-CLI"); curl_easy_setopt(curl,CURLOPT_USERAGENT,"ZeroTier-CLI");
curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(state.opts.count(ZT_CLI_FLAG_UNSAFE_SSL) > 0) ? 0L : 1L); curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(state.opts.count(ZT_CLI_FLAG_UNSAFE_SSL) > 0) ? 0L : 1L);
curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf); curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);
curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,0L);
Utils::scopy(urlbuf,sizeof(urlbuf),url.c_str());
curl_easy_setopt(curl,CURLOPT_URL,urlbuf);
struct curl_slist *hdrs = (struct curl_slist *)0;
for(std::map<std::string,std::string>::const_iterator i(headers.begin());i!=headers.end();++i) {
std::string htmp(i->first);
htmp.append(": ");
htmp.append(i->second);
hdrs = curl_slist_append(hdrs,htmp.c_str());
}
if (hdrs)
curl_easy_setopt(curl,CURLOPT_HTTPHEADER,hdrs);
memset(errbuf,0,sizeof(errbuf)); memset(errbuf,0,sizeof(errbuf));
CURLcode res = curl_easy_perform(curl); CURLcode res = curl_easy_perform(curl);
@ -182,9 +196,13 @@ static std::tuple<int,std::string> GET(const CLIState &state,const std::map<std:
if (res != CURLE_OK) if (res != CURLE_OK)
return std::make_tuple(-1,std::string(errbuf)); return std::make_tuple(-1,std::string(errbuf));
curl_easy_cleanup(curl); int rc = (int)curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE);
return std::make_tuple(0,body); curl_easy_cleanup(curl);
if (hdrs)
curl_slist_free_all(hdrs);
return std::make_tuple(rc,body);
} }
} // anonymous namespace } // anonymous namespace