ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-03-13 15:56:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Decided to back out of doing HTTP/TCP server *and* client within ZT itself. Instead we'll do the TCP tunneling endpoint as a separate little daemon. It will appear here shortly.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-04-13 12:27:29 -07:00
parent 5c1262f324
commit ff0eff4b7c
1 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
service/One.cpp
View File

@ -458,47 +458,6 @@ public:
std::string contentType; std::string contentType;
unsigned int scode = 404; unsigned int scode = 404;
if ((htc->url.length() >= 3)&&(htc->url[0] == '/')&&(htc->url[1] == 'Z')&&(htc->url[2] == 'T')) {
/* Paths of /ZT<anything> indicate the tunneling of the ZeroTier
* protocol over TCP/HTTP. GETs invoke old school long-polling to
* wait for a packet, while POST or PUT submits a packet to be
* parsed. This is our desperation >= 1 path. */
switch(htc->parser.method) {
case HTTP_GET: {
} break;
case HTTP_POST:
case HTTP_PUT: {
ZT1_ResultCode rc = _node->processWirePacket(
OSUtils::now(),
(const struct sockaddr_storage *)&(htc->from),
1,
(const void *)htc->body.data(),
(unsigned int)htc->body.length(),
&_nextBackgroundTaskDeadline);
if (ZT1_ResultCode_isFatal(rc)) {
char tmp[256];
Utils::snprintf(tmp,sizeof(tmp),"fatal error code from processWirePacket(%d)",(int)rc);
Mutex::Lock _l(_termReason_m);
_termReason = ONE_UNRECOVERABLE_ERROR;
_fatalErrorMessage = tmp;
this->terminate();
return;
} else {
data = "";
contentType = "text/plain";
scode = 200;
}
} break;
default:
data = "Invalid method for ZeroTier protocol tunneling request.";
contentType = "text/plain";
scode = 405;
htc->shouldKeepAlive = false;
break;
}
} else {
/* Other paths are passed along to the control plane, which is currently
* only allowed from loopback. */
if ((htc->from == InetAddress::LO4)||(htc->from == InetAddress::LO6)) { if ((htc->from == InetAddress::LO4)||(htc->from == InetAddress::LO6)) {
//scode = _controlPlane.handleRequest(htc->parser.method,htc->url,htc->headers,htc->body,data,contentType); //scode = _controlPlane.handleRequest(htc->parser.method,htc->url,htc->headers,htc->body,data,contentType);
} else { } else {
@ -507,7 +466,6 @@ public:
scode = 403; scode = 403;
htc->shouldKeepAlive = false; htc->shouldKeepAlive = false;
} }
}
Utils::snprintf(tmpn,sizeof(tmpn),"HTTP/1.1 %.3u %s\r\nServer: ZeroTier One\r\nCache-Control: no-cache\r\nPragma: no-cache\r\n",scode,((scode == 200) ? "OK" : ((scode == 404) ? "Not Found" : "Error"))); Utils::snprintf(tmpn,sizeof(tmpn),"HTTP/1.1 %.3u %s\r\nServer: ZeroTier One\r\nCache-Control: no-cache\r\nPragma: no-cache\r\n",scode,((scode == 200) ? "OK" : ((scode == 404) ? "Not Found" : "Error")));
htc->body.assign(tmpn); htc->body.assign(tmpn);