ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-30 17:56:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'adamierymenko-dev' into android-jni

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Grant Limberg 2015-04-30 19:19:45 -07:00
commit 52df59c552
24 changed files with 417 additions and 1971 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@ -34,16 +34,10 @@
.qmake.stash .qmake.stash
*.autosave *.autosave
/ZeroTier One.dmg /ZeroTier One.dmg
/root-topology/*.secret /root-topology/bin2c
/testnet/local-testnet/n???? /root-topology/mktopology
/testnet/local-testnet/*/peers.persist /root-topology/test/supernodes
/testnet/local-testnet/*/authtoken.secret /root-topology/test/test-root-topology
/testnet/local-testnet/*/*.log
/testnet/local-testnet/*/*.old
/testnet/local-testnet/*/root-topology
/testnet/local-testnet/*/local.conf
/testnet/local-testnet/*/networks.d
/netconf/netconf.db
java/obj/ java/obj/
java/libs/ java/libs/
java/bin/ java/bin/

59
.gitignore.orig Normal file
View File

@ -0,0 +1,59 @@
/ext/llvm-g++-Xcode4.6.2
/ext/llvm-g++-Xcode4.6.2.tar.bz2
/zerotier-*
/ZeroTierUI/*.user
*.o
.DS_Store
.Apple*
*.dSYM
/netconf-service/node_modules
/ipch
/windows/ZeroTierOne.sdf
/windows/ZeroTierOne.v11.suo
/windows/x64
/windows/Win32
/windows/*/x64
/windows/*/Win32
/windows/ZeroTierOne/Release
/windows/ZeroTierOneService/obj
/windows/ZeroTierOneService/bin
/windows/Build
/ext/installfiles/windows/ZeroTier One-SetupFiles
/ext/installfiles/windows/Prerequisites
*.log
*.opensdf
*.user
*.cache
*.obj
*.tlog
*.pid
/*.deb
/*.rpm
/build-*
/ZeroTierOneInstaller-*
.qmake.stash
*.autosave
/ZeroTier One.dmg
/root-topology/bin2c
/root-topology/mktopology
/root-topology/*.secret
<<<<<<< HEAD
/testnet/local-testnet/n????
/testnet/local-testnet/*/peers.persist
/testnet/local-testnet/*/authtoken.secret
/testnet/local-testnet/*/*.log
/testnet/local-testnet/*/*.old
/testnet/local-testnet/*/root-topology
/testnet/local-testnet/*/local.conf
/testnet/local-testnet/*/networks.d
/netconf/netconf.db
java/obj/
java/libs/
java/bin/
java/classes/
java/doc/
windows/ZeroTierOne/Debug/
=======
/root-topology/test/supernodes
/root-topology/test/test-root-topology
>>>>>>> adamierymenko-dev

765
attic/testnet.cpp
View File

@ -1,765 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
/* SEE: testnet/README.md */
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <string>
#include <map>
#include <vector>
#include <set>
#include "node/Constants.hpp"
#include "node/Node.hpp"
#include "node/Utils.hpp"
#include "node/Address.hpp"
#include "node/Identity.hpp"
#include "node/Thread.hpp"
#include "node/CMWC4096.hpp"
#include "node/Dictionary.hpp"
#include "testnet/SimNet.hpp"
#include "testnet/SimNetSocketManager.hpp"
#include "testnet/TestEthernetTap.hpp"
#include "testnet/TestEthernetTapFactory.hpp"
#ifdef __WINDOWS__
#include <windows.h>
#else
#include <unistd.h>
#include <sys/stat.h>
#endif
using namespace ZeroTier;
class SimNode
{
public:
SimNode(SimNet &net,const std::string &hp,const char *rootTopology,bool issn,const InetAddress &addr) :
home(hp),
tapFactory(),
socketManager(net.newEndpoint(addr)),
node(home.c_str(),&tapFactory,socketManager,false,rootTopology),
reasonForTermination(Node::NODE_RUNNING),
supernode(issn)
{
thread = Thread::start(this);
}
~SimNode()
{
node.terminate(Node::NODE_NORMAL_TERMINATION,"SimNode shutdown");
Thread::join(thread);
}
void threadMain()
throw()
{
reasonForTermination = node.run();
}
std::string home;
TestEthernetTapFactory tapFactory;
SimNetSocketManager *socketManager;
Node node;
Node::ReasonForTermination reasonForTermination;
bool supernode;
Thread thread;
};
static std::string basePath;
static SimNet net;
static std::map< Address,SimNode * > nodes;
static std::map< InetAddress,Address > usedIps;
static CMWC4096 prng;
static std::string rootTopology;
// Converts an address into a fake IP not already claimed.
// Be sure to call only once, as this claims the IP before returning it.
static InetAddress inetAddressFromZeroTierAddress(const Address &addr)
{
uint32_t ip = (uint32_t)(addr.toInt() & 0xffffffff);
for(;;) {
if (((ip >> 24) & 0xff) >= 240) {
ip &= 0x00ffffff;
ip |= (((ip >> 24) & 0xff) % 240) << 24;
}
if (((ip >> 24) & 0xff) == 0)
ip |= 0x01000000;
if (((ip & 0xff) == 0)||((ip & 0xff) == 255))
ip ^= 0x00000001;
InetAddress inaddr(Utils::hton(ip),9993);
if (usedIps.find(inaddr) == usedIps.end()) {
usedIps[inaddr] = addr;
return inaddr;
}
++ip; // keep looking sequentially for an unclaimed IP
}
}
static Identity makeNodeHome(bool super)
{
Identity id;
id.generate();
std::string path(basePath + ZT_PATH_SEPARATOR_S + (super ? "S" : "N") + id.address().toString());
#ifdef __WINDOWS__
CreateDirectoryA(path.c_str(),NULL);
#else
mkdir(path.c_str(),0700);
#endif
if (!Utils::writeFile((path + ZT_PATH_SEPARATOR_S + "identity.secret").c_str(),id.toString(true)))
return Identity();
if (!Utils::writeFile((path + ZT_PATH_SEPARATOR_S + "identity.public").c_str(),id.toString(false)))
return Identity();
return id;
}
// Instantiates supernodes by scanning for S########## subdirectories
static std::vector<Address> initSupernodes()
{
Dictionary supernodes;
std::vector< std::pair<Identity,InetAddress> > snids;
std::map<std::string,bool> dir(Utils::listDirectory(basePath.c_str()));
for(std::map<std::string,bool>::iterator d(dir.begin());d!=dir.end();++d) {
if ((d->first.length() == 11)&&(d->second)&&(d->first[0] == 'S')) {
std::string idbuf;
if (Utils::readFile((basePath + ZT_PATH_SEPARATOR_S + d->first + ZT_PATH_SEPARATOR_S + "identity.public").c_str(),idbuf)) {
Identity id(idbuf);
if (id) {
InetAddress inaddr(inetAddressFromZeroTierAddress(id.address()));
snids.push_back(std::pair<Identity,InetAddress>(id,inaddr));
Dictionary snd;
snd["id"] = id.toString(false);
snd["udp"] = inaddr.toString();
snd["desc"] = id.address().toString();
snd["dns"] = inaddr.toIpString();
supernodes[id.address().toString()] = snd.toString();
}
}
}
}
Dictionary rtd;
rtd["supernodes"] = supernodes.toString();
rtd["noupdate"] = "1";
rootTopology = rtd.toString();
std::vector<Address> newNodes;
for(std::vector< std::pair<Identity,InetAddress> >::iterator i(snids.begin());i!=snids.end();++i) {
SimNode *n = new SimNode(net,(basePath + ZT_PATH_SEPARATOR_S + "S" + i->first.address().toString()),rootTopology.c_str(),true,i->second);
nodes[i->first.address()] = n;
newNodes.push_back(i->first.address());
}
return newNodes;
}
// Instantiates any not-already-instantiated regular nodes
static std::vector<Address> scanForNewNodes()
{
std::vector<Address> newNodes;
std::map<std::string,bool> dir(Utils::listDirectory(basePath.c_str()));
for(std::map<std::string,bool>::iterator d(dir.begin());d!=dir.end();++d) {
if ((d->first.length() == 11)&&(d->second)&&(d->first[0] == 'N')) {
Address na(d->first.c_str() + 1);
if (nodes.find(na) == nodes.end()) {
InetAddress inaddr(inetAddressFromZeroTierAddress(na));
SimNode *n = new SimNode(net,(basePath + ZT_PATH_SEPARATOR_S + d->first),rootTopology.c_str(),false,inaddr);
nodes[na] = n;
newNodes.push_back(na);
}
}
}
return newNodes;
}
static void doHelp(const std::vector<std::string> &cmd)
{
printf("---------- help"ZT_EOL_S);
printf("---------- mksn <number of supernodes>"ZT_EOL_S);
printf("---------- mkn <number of normal nodes>"ZT_EOL_S);
printf("---------- list"ZT_EOL_S);
printf("---------- join <address/*/**> <network ID>"ZT_EOL_S);
printf("---------- leave <address/*/**> <network ID>"ZT_EOL_S);
printf("---------- listnetworks <address/*/**>"ZT_EOL_S);
printf("---------- listpeers <address/*/**>"ZT_EOL_S);
printf("---------- unicast <address/*/**> <address/*/**> <network ID> <frame length, min: 16> [<timeout (sec)>]"ZT_EOL_S);
printf("---------- multicast <address/*/**> <MAC/* for bcast> <network ID> <frame length, min: 16> [<timeout (sec)>]"ZT_EOL_S);
printf("---------- quit"ZT_EOL_S);
printf("---------- ( * means all regular nodes, ** means including supernodes )"ZT_EOL_S);
printf("---------- ( . runs previous command again )"ZT_EOL_S);
}
static void doMKSN(const std::vector<std::string> &cmd)
{
if (cmd.size() < 2) {
doHelp(cmd);
return;
}
if (nodes.size() > 0) {
printf("---------- mksn error: mksn can only be called once (network already exists)"ZT_EOL_S);
return;
}
int count = Utils::strToInt(cmd[1].c_str());
for(int i=0;i<count;++i) {
Identity id(makeNodeHome(true));
printf("%s identity created"ZT_EOL_S,id.address().toString().c_str());
}
std::vector<Address> nodes(initSupernodes());
for(std::vector<Address>::iterator a(nodes.begin());a!=nodes.end();++a)
printf("%s started (supernode)"ZT_EOL_S,a->toString().c_str());
//printf("---------- root topology is: %s"ZT_EOL_S,rootTopology.c_str());
}
static void doMKN(const std::vector<std::string> &cmd)
{
if (cmd.size() < 2) {
doHelp(cmd);
return;
}
if (nodes.size() == 0) {
printf("---------- mkn error: use mksn to create supernodes first."ZT_EOL_S);
return;
}
int count = Utils::strToInt(cmd[1].c_str());
for(int i=0;i<count;++i) {
Identity id(makeNodeHome(false));
printf("%s identity created"ZT_EOL_S,id.address().toString().c_str());
}
std::vector<Address> nodes(scanForNewNodes());
for(std::vector<Address>::iterator a(nodes.begin());a!=nodes.end();++a)
printf("%s started (regular node)"ZT_EOL_S,a->toString().c_str());
}
static void doList(const std::vector<std::string> &cmd)
{
unsigned int peers = 0,supernodes = 0;
ZT1_Node_Status status;
for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) {
n->second->node.status(&status);
if (status.initialized) {
printf("%s %c %s (%u peers, %u direct links)"ZT_EOL_S,
n->first.toString().c_str(),
n->second->supernode ? 'S' : 'N',
(status.online ? "ONLINE" : "OFFLINE"),
status.knownPeers,
status.directlyConnectedPeers);
if (n->second->supernode)
++supernodes;
else ++peers;
} else printf("%s ? INITIALIZING (0 peers, 0 direct links)"ZT_EOL_S,n->first.toString().c_str());
}
printf("---------- %u regular peers, %u supernodes"ZT_EOL_S,peers,supernodes);
}
static void doJoin(const std::vector<std::string> &cmd)
{
if (cmd.size() < 3) {
doHelp(cmd);
return;
}
std::vector<Address> addrs;
if ((cmd[1] == "*")||(cmd[1] == "**")) {
bool includeSuper = (cmd[1] == "**");
for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) {
if ((includeSuper)||(!n->second->supernode))
addrs.push_back(n->first);
}
} else addrs.push_back(Address(cmd[1]));
uint64_t nwid = Utils::hexStrToU64(cmd[2].c_str());
for(std::vector<Address>::iterator a(addrs.begin());a!=addrs.end();++a) {
std::map< Address,SimNode * >::iterator n(nodes.find(*a));
if (n != nodes.end()) {
n->second->node.join(nwid);
printf("%s join %.16llx"ZT_EOL_S,n->first.toString().c_str(),(unsigned long long)nwid);
}
}
}
static void doLeave(const std::vector<std::string> &cmd)
{
if (cmd.size() < 3) {
doHelp(cmd);
return;
}
std::vector<Address> addrs;
if ((cmd[1] == "*")||(cmd[1] == "**")) {
bool includeSuper = (cmd[1] == "**");
for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) {
if ((includeSuper)||(!n->second->supernode))
addrs.push_back(n->first);
}
} else addrs.push_back(Address(cmd[1]));
uint64_t nwid = Utils::hexStrToU64(cmd[2].c_str());
for(std::vector<Address>::iterator a(addrs.begin());a!=addrs.end();++a) {
std::map< Address,SimNode * >::iterator n(nodes.find(*a));
if (n != nodes.end()) {
n->second->node.leave(nwid);
printf("%s leave %.16llx"ZT_EOL_S,n->first.toString().c_str(),(unsigned long long)nwid);
}
}
}
static void doListNetworks(const std::vector<std::string> &cmd)
{
if (cmd.size() < 2) {
doHelp(cmd);
return;
}
std::vector<Address> addrs;
if ((cmd[1] == "*")||(cmd[1] == "**")) {
bool includeSuper = (cmd[1] == "**");
for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) {
if ((includeSuper)||(!n->second->supernode))
addrs.push_back(n->first);
}
} else addrs.push_back(Address(cmd[1]));
printf("---------- <nwid> <name> <mac> <status> <config age> <type> <dev> <ips>"ZT_EOL_S);
for(std::vector<Address>::iterator a(addrs.begin());a!=addrs.end();++a) {
std::string astr(a->toString());
std::map< Address,SimNode * >::iterator n(nodes.find(*a));
if (n != nodes.end()) {
ZT1_Node_NetworkList *nl = n->second->node.listNetworks();
if (nl) {
for(unsigned int i=0;i<nl->numNetworks;++i) {
printf("%s %s %s %s %s %ld %s %s ",
astr.c_str(),
nl->networks[i].nwidHex,
nl->networks[i].name,
nl->networks[i].macStr,
nl->networks[i].statusStr,
nl->networks[i].configAge,
(nl->networks[i].isPrivate ? "private" : "public"),
nl->networks[i].device);
if (nl->networks[i].numIps > 0) {
for(unsigned int j=0;j<nl->networks[i].numIps;++j) {
if (j > 0)
printf(",");
printf("%s/%d",nl->networks[i].ips[j].ascii,(int)nl->networks[i].ips[j].port);
}
} else printf("-");
printf(ZT_EOL_S);
}
n->second->node.freeQueryResult(nl);
}
}
}
}
static void doListPeers(const std::vector<std::string> &cmd)
{
if (cmd.size() < 2) {
doHelp(cmd);
return;
}
std::vector<Address> addrs;
if ((cmd[1] == "*")||(cmd[1] == "**")) {
bool includeSuper = (cmd[1] == "**");
for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) {
if ((includeSuper)||(!n->second->supernode))
addrs.push_back(n->first);
}
} else addrs.push_back(Address(cmd[1]));
printf("---------- <ztaddr> <paths> <latency> <version> <role>"ZT_EOL_S);
for(std::vector<Address>::iterator a(addrs.begin());a!=addrs.end();++a) {
std::string astr(a->toString());
std::map< Address,SimNode * >::iterator n(nodes.find(*a));
if (n != nodes.end()) {
ZT1_Node_PeerList *pl = n->second->node.listPeers();
if (pl) {
for(unsigned int i=0;i<pl->numPeers;++i) {
printf("%s %.10llx ",astr.c_str(),(unsigned long long)pl->peers[i].rawAddress);
if (pl->peers[i].numPaths == 0)
printf("-");
else {
for(unsigned int j=0;j<pl->peers[i].numPaths;++j) {
if (j > 0)
printf(",");
switch(pl->peers[i].paths[j].type) {
default:
printf("unknown;");
break;
case ZT1_Node_PhysicalPath_TYPE_UDP:
printf("udp;");
break;
case ZT1_Node_PhysicalPath_TYPE_TCP_OUT:
printf("tcp_out;");
break;
case ZT1_Node_PhysicalPath_TYPE_TCP_IN:
printf("tcp_in;");
break;
case ZT1_Node_PhysicalPath_TYPE_ETHERNET:
printf("eth;");
break;
}
printf("%s/%d;%ld;%ld;%ld;%s",
pl->peers[i].paths[j].address.ascii,
(int)pl->peers[i].paths[j].address.port,
pl->peers[i].paths[j].lastSend,
pl->peers[i].paths[j].lastReceive,
pl->peers[i].paths[j].lastPing,
(pl->peers[i].paths[j].fixed ? "fixed" : (pl->peers[i].paths[j].active ? "active" : "inactive")));
}
}
const char *rolestr;
switch(pl->peers[i].role) {
case ZT1_Node_Peer_SUPERNODE: rolestr = "SUPERNODE"; break;
case ZT1_Node_Peer_HUB: rolestr = "HUB"; break;
case ZT1_Node_Peer_NODE: rolestr = "NODE"; break;
default: rolestr = "?"; break;
}
printf(" %u %s %s"ZT_EOL_S,
pl->peers[i].latency,
((pl->peers[i].remoteVersion[0]) ? pl->peers[i].remoteVersion : "-"),
rolestr);
}
n->second->node.freeQueryResult(pl);
}
}
}
}
static void doUnicast(const std::vector<std::string> &cmd)
{
union {
uint64_t i[2];
unsigned char data[2800];
} pkt;
if (cmd.size() < 5) {
doHelp(cmd);
return;
}
uint64_t nwid = Utils::hexStrToU64(cmd[3].c_str());
unsigned int frameLen = Utils::strToUInt(cmd[4].c_str());
uint64_t tout = 2000;
if (cmd.size() >= 6)
tout = Utils::strToU64(cmd[5].c_str()) * 1000ULL;
if (frameLen < 16)
frameLen = 16;
if (frameLen > 2800)
frameLen = 2800;
std::vector<Address> senders;
if ((cmd[1] == "*")||(cmd[1] == "**")) {
bool includeSuper = (cmd[1] == "**");
for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) {
if ((includeSuper)||(!n->second->supernode))
senders.push_back(n->first);
}
} else senders.push_back(Address(cmd[1]));
std::vector<Address> receivers;
if ((cmd[2] == "*")||(cmd[2] == "**")) {
bool includeSuper = (cmd[2] == "**");
for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) {
if ((includeSuper)||(!n->second->supernode))
receivers.push_back(n->first);
}
} else receivers.push_back(Address(cmd[2]));
for(unsigned int i=0;i<frameLen;++i)
pkt.data[i] = (unsigned char)prng.next32();
std::set< std::pair<Address,Address> > sentPairs;
for(std::vector<Address>::iterator s(senders.begin());s!=senders.end();++s) {
for(std::vector<Address>::iterator r(receivers.begin());r!=receivers.end();++r) {
if (*s == *r)
continue;
SimNode *sender = nodes[*s];
SimNode *receiver = nodes[*r];
TestEthernetTap *stap = sender->tapFactory.getByNwid(nwid);
TestEthernetTap *rtap = receiver->tapFactory.getByNwid(nwid);
if ((stap)&&(rtap)) {
pkt.i[0] = s->toInt();
pkt.i[1] = Utils::now();
stap->injectPacketFromHost(stap->mac(),rtap->mac(),0xdead,pkt.data,frameLen);
printf("%s -> %s etherType 0xdead network %.16llx length %u"ZT_EOL_S,s->toString().c_str(),r->toString().c_str(),(unsigned long long)nwid,frameLen);
sentPairs.insert(std::pair<Address,Address>(*s,*r));
} else if (stap) {
printf("%s -> !%s (receiver not a member of %.16llx)"ZT_EOL_S,s->toString().c_str(),r->toString().c_str(),(unsigned long long)nwid);
} else if (rtap) {
printf("%s -> !%s (sender not a member of %.16llx)"ZT_EOL_S,s->toString().c_str(),r->toString().c_str(),(unsigned long long)nwid);
} else {
printf("%s -> !%s (neither party is a member of %.16llx)"ZT_EOL_S,s->toString().c_str(),r->toString().c_str(),(unsigned long long)nwid);
}
}
}
printf("---------- waiting up to %llu seconds..."ZT_EOL_S,tout / 1000ULL);
std::set< std::pair<Address,Address> > receivedPairs;
TestEthernetTap::TestFrame frame;
uint64_t toutend = Utils::now() + tout;
do {
for(std::vector<Address>::iterator r(receivers.begin());r!=receivers.end();++r) {
SimNode *receiver = nodes[*r];
TestEthernetTap *rtap = receiver->tapFactory.getByNwid(nwid);
if ((rtap)&&(rtap->getNextReceivedFrame(frame,5))) {
if ((frame.len == frameLen)&&(!memcmp(frame.data + 16,pkt.data + 16,frameLen - 16))) {
uint64_t ints[2];
memcpy(ints,frame.data,16);
printf("%s <- %.10llx received test packet, length == %u, latency == %llums"ZT_EOL_S,r->toString().c_str(),(unsigned long long)ints[0],frame.len,(unsigned long long)(frame.timestamp - ints[1]));
receivedPairs.insert(std::pair<Address,Address>(Address(ints[0]),*r));
} else {
printf("%s !! got spurious packet, length == %u, etherType == 0x%.4x"ZT_EOL_S,r->toString().c_str(),frame.len,frame.etherType);
}
}
}
Thread::sleep(100);
} while ((receivedPairs.size() < sentPairs.size())&&(Utils::now() < toutend));
for(std::vector<Address>::iterator s(senders.begin());s!=senders.end();++s) {
for(std::vector<Address>::iterator r(receivers.begin());r!=receivers.end();++r) {
if (*s == *r)
continue;
if ((sentPairs.count(std::pair<Address,Address>(*s,*r)))&&(!receivedPairs.count(std::pair<Address,Address>(*s,*r)))) {
printf("%s <- %s was never received (timed out)"ZT_EOL_S,r->toString().c_str(),s->toString().c_str());
}
}
}
printf("---------- sent %u, received %u"ZT_EOL_S,(unsigned int)sentPairs.size(),(unsigned int)receivedPairs.size());
}
static void doMulticast(const std::vector<std::string> &cmd)
{
union {
uint64_t i[2];
unsigned char data[2800];
} pkt;
if (cmd.size() < 5) {
doHelp(cmd);
return;
}
uint64_t nwid = Utils::hexStrToU64(cmd[3].c_str());
unsigned int frameLen = Utils::strToUInt(cmd[4].c_str());
uint64_t tout = 2000;
if (cmd.size() >= 6)
tout = Utils::strToU64(cmd[5].c_str()) * 1000ULL;
if (frameLen < 16)
frameLen = 16;
if (frameLen > 2800)
frameLen = 2800;
std::vector<Address> senders;
if ((cmd[1] == "*")||(cmd[1] == "**")) {
bool includeSuper = (cmd[1] == "**");
for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) {
if ((includeSuper)||(!n->second->supernode))
senders.push_back(n->first);
}
} else senders.push_back(Address(cmd[1]));
MAC mcaddr;
if (cmd[2] == "*")
mcaddr = MAC(0xff,0xff,0xff,0xff,0xff,0xff);
else mcaddr.fromString(cmd[2].c_str());
if (!mcaddr.isMulticast()) {
printf("---------- %s is not a multicast MAC address"ZT_EOL_S,mcaddr.toString().c_str());
return;
}
for(unsigned int i=0;i<frameLen;++i)
pkt.data[i] = (unsigned char)prng.next32();
for(std::vector<Address>::iterator s(senders.begin());s!=senders.end();++s) {
SimNode *sender = nodes[*s];
TestEthernetTap *stap = sender->tapFactory.getByNwid(nwid);
if (stap) {
pkt.i[0] = s->toInt();
pkt.i[1] = Utils::now();
stap->injectPacketFromHost(stap->mac(),mcaddr,0xdead,pkt.data,frameLen);
printf("%s -> %s etherType 0xdead network %.16llx length %u"ZT_EOL_S,s->toString().c_str(),mcaddr.toString().c_str(),(unsigned long long)nwid,frameLen);
} else {
printf("%s -> !%s (sender is not a member of %.16llx)"ZT_EOL_S,s->toString().c_str(),mcaddr.toString().c_str(),(unsigned long long)nwid);
}
}
printf("---------- waiting %llu seconds..."ZT_EOL_S,tout / 1000ULL);
unsigned int receiveCount = 0;
TestEthernetTap::TestFrame frame;
uint64_t toutend = Utils::now() + tout;
do {
for(std::map< Address,SimNode * >::iterator nn(nodes.begin());nn!=nodes.end();++nn) {
SimNode *receiver = nn->second;
TestEthernetTap *rtap = receiver->tapFactory.getByNwid(nwid);
if ((rtap)&&(rtap->getNextReceivedFrame(frame,5))) {
if ((frame.len == frameLen)&&(!memcmp(frame.data + 16,pkt.data + 16,frameLen - 16))) {
uint64_t ints[2];
memcpy(ints,frame.data,16);
printf("%s <- %.10llx received test packet, length == %u, latency == %llums"ZT_EOL_S,nn->first.toString().c_str(),(unsigned long long)ints[0],frame.len,(unsigned long long)(frame.timestamp - ints[1]));
++receiveCount;
} else {
printf("%s !! got spurious packet, length == %u, etherType == 0x%.4x"ZT_EOL_S,nn->first.toString().c_str(),frame.len,frame.etherType);
}
}
}
Thread::sleep(100);
} while (Utils::now() < toutend);
printf("---------- test multicast received by %u peers"ZT_EOL_S,receiveCount);
}
int main(int argc,char **argv)
{
char linebuf[1024];
if (argc <= 1) {
fprintf(stderr,"Usage: %s <base path for temporary node home directories>"ZT_EOL_S,argv[0]);
return 1;
}
basePath = argv[1];
#ifdef __WINDOWS__
CreateDirectoryA(basePath.c_str(),NULL);
#else
mkdir(basePath.c_str(),0700);
#endif
printf("*** ZeroTier One Version %s -- Headless Network Simulator ***"ZT_EOL_S,Node::versionString());
printf(ZT_EOL_S);
{
printf("---------- scanning '%s' for existing network..."ZT_EOL_S,basePath.c_str());
std::vector<Address> snodes(initSupernodes());
if (snodes.empty()) {
printf("---------- no existing network found; use 'mksn' to create one."ZT_EOL_S);
} else {
for(std::vector<Address>::iterator a(snodes.begin());a!=snodes.end();++a)
printf("%s started (supernode)"ZT_EOL_S,a->toString().c_str());
//printf("---------- root topology is: %s"ZT_EOL_S,rootTopology.c_str());
std::vector<Address> nodes(scanForNewNodes());
for(std::vector<Address>::iterator a(nodes.begin());a!=nodes.end();++a)
printf("%s started (normal peer)"ZT_EOL_S,a->toString().c_str());
printf("---------- %u peers and %u supernodes loaded!"ZT_EOL_S,(unsigned int)nodes.size(),(unsigned int)snodes.size());
}
}
printf(ZT_EOL_S);
printf("Type 'help' for help."ZT_EOL_S);
printf(ZT_EOL_S);
std::vector<std::string> cmd,prevCmd;
bool run = true;
while (run) {
printf(">> ");
fflush(stdout);
if (!fgets(linebuf,sizeof(linebuf),stdin))
break;
cmd = Utils::split(linebuf," \r\n\t","\\","\"");
for(;;) {
if (cmd.size() == 0)
break;
else if (cmd[0] == "quit")
run = false;
else if (cmd[0] == "help")
doHelp(cmd);
else if (cmd[0] == "mksn")
doMKSN(cmd);
else if (cmd[0] == "mkn")
doMKN(cmd);
else if (cmd[0] == "list")
doList(cmd);
else if (cmd[0] == "join")
doJoin(cmd);
else if (cmd[0] == "leave")
doLeave(cmd);
else if (cmd[0] == "listnetworks")
doListNetworks(cmd);
else if (cmd[0] == "listpeers")
doListPeers(cmd);
else if (cmd[0] == "unicast")
doUnicast(cmd);
else if (cmd[0] == "multicast")
doMulticast(cmd);
else if ((cmd[0] == ".")&&(prevCmd.size() > 0)) {
cmd = prevCmd;
continue;
} else doHelp(cmd);
break;
}
if ((cmd.size() > 0)&&(cmd[0] != "."))
prevCmd = cmd;
}
for(std::map< Address,SimNode * >::iterator n(nodes.begin());n!=nodes.end();++n) {
printf("%s shutting down..."ZT_EOL_S,n->first.toString().c_str());
delete n->second;
}
return 0;
}

181
attic/testnet/MTQ.hpp
View File

@ -1,181 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc. LLC
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
#ifndef ZT_MTQ_HPP
#define ZT_MTQ_HPP
#include <stdlib.h>
#include <stdint.h>
#include <queue>
#include "../node/Constants.hpp"
#include "../node/NonCopyable.hpp"
#include "../node/Utils.hpp"
#ifdef __WINDOWS__
#include <Windows.h>
#else
#include <time.h>
#include <pthread.h>
#endif
namespace ZeroTier {
/**
* A synchronized multithreaded FIFO queue
*
* This is designed for a use case where one thread pushes, the
* other pops.
*/
template<typename T>
class MTQ : NonCopyable
{
public:
MTQ()
{
#ifdef __WINDOWS__
_sem = CreateSemaphore(NULL,0,0x7fffffff,NULL);
InitializeCriticalSection(&_cs);
#else
pthread_mutex_init(&_mh,(const pthread_mutexattr_t *)0);
pthread_cond_init(&_cond,(const pthread_condattr_t *)0);
#endif
}
~MTQ()
{
#ifdef __WINDOWS__
CloseHandle(_sem);
DeleteCriticalSection(&_cs);
#else
pthread_cond_destroy(&_cond);
pthread_mutex_destroy(&_mh);
#endif
}
/**
* Push something onto the end of the FIFO and signal waiting thread(s)
*
* @param v Value to push
*/
inline void push(const T &v)
{
#ifdef __WINDOWS__
EnterCriticalSection(&_cs);
try {
_q.push(v);
LeaveCriticalSection(&_cs);
ReleaseSemaphore(_sem,1,NULL);
} catch ( ... ) {
LeaveCriticalSection(&_cs);
throw;
}
#else
pthread_mutex_lock(const_cast <pthread_mutex_t *>(&_mh));
try {
_q.push(v);
pthread_mutex_unlock(const_cast <pthread_mutex_t *>(&_mh));
pthread_cond_signal(const_cast <pthread_cond_t *>(&_cond));
} catch ( ... ) {
pthread_mutex_unlock(const_cast <pthread_mutex_t *>(&_mh));
throw;
}
#endif
}
/**
* Pop fron queue with optional timeout
*
* @param v Result parameter to set to next value
* @param ms Milliseconds timeout or 0 for none
* @return True if v was set to something, false on timeout
*/
inline bool pop(T &v,unsigned long ms = 0)
{
#ifdef __WINDOWS__
if (ms > 0)
WaitForSingleObject(_sem,(DWORD)ms);
else WaitForSingleObject(_sem,INFINITE);
EnterCriticalSection(&_cs);
try {
if (_q.empty()) {
LeaveCriticalSection(&_cs);
return false;
} else {
v = _q.front();
_q.pop();
LeaveCriticalSection(&_cs);
return true;
}
} catch ( ... ) {
LeaveCriticalSection(&_cs);
throw;
}
#else
pthread_mutex_lock(const_cast <pthread_mutex_t *>(&_mh));
try {
if (_q.empty()) {
if (ms > 0) {
uint64_t when = Utils::now() + (uint64_t)ms;
struct timespec ts;
ts.tv_sec = (unsigned long)(when / 1000);
ts.tv_nsec = (unsigned long)(when % 1000) * (unsigned long)1000000;
pthread_cond_timedwait(const_cast <pthread_cond_t *>(&_cond),const_cast <pthread_mutex_t *>(&_mh),&ts);
} else {
pthread_cond_wait(const_cast <pthread_cond_t *>(&_cond),const_cast <pthread_mutex_t *>(&_mh));
}
if (_q.empty()) {
pthread_mutex_unlock(const_cast <pthread_mutex_t *>(&_mh));
return false;
}
}
v = _q.front();
_q.pop();
pthread_mutex_unlock(const_cast <pthread_mutex_t *>(&_mh));
return true;
} catch ( ... ) {
pthread_mutex_unlock(const_cast <pthread_mutex_t *>(&_mh));
throw;
}
#endif
}
private:
std::queue<T> _q;
#ifdef __WINDOWS__
HANDLE _sem;
CRITICAL_SECTION _cs;
#else
pthread_cond_t _cond;
pthread_mutex_t _mh;
#endif
};
} // namespace ZeroTier
#endif

36
attic/testnet/README.md
View File

@ -1,36 +0,0 @@
Headless Test Network
======
The code in testnet.cpp (in base) and here in testnet/ is for running headless ZeroTier One test networks.
To build, type (from base) "make testnet". This will build the *zerotier-testnet* binary. Then run it with a directory to use for temporary node home directory storage as a parameter, e.g. "./zerotier-testnet /tmp/zttestnet".
Type **help** for help.
Right now the testnet simulates a perfect IP network and allows you to perform unicast and multicast tests. This is useful for verifying the basic correctness of everything under ideal conditions, and for smoke testing. In the future support for NAT emulation, packet loss, and other test features will be added to make this a more full-blown test suite.
When you start the testnet for the first time, no nodes will exist. You have to create some. First, create supernodes with **mksn**. Create as many as you want. Once you've created supernodes (you can only do this once per testnet) you can create regular nodes with **mkn**.
Once everything is created use **list** to check the status.
Each node will create a couple threads, so if your OS imposes a limit this might cause some of your virtual nodes to stick in *INITIALIZING* status as shown in the **list** command. If this happens you might want to blow away the contents of your temp directory and try again with fewer nodes.
Each node will get a home at the test path you specified, so quitting with **quit** and re-entering will reload the same test network.
Next you'll need to join your nodes to a virtual ZeroTier network. ZeroTier supports a built-in "fake" public network with the ID **ffffffffffffffff**. This network is for testing and is convenient to use here. It's also possible to set up the netconf-master within one of your test nodes, but doing so is beyond the scope of this doc (for now, but if your clever you can probably figure it out). Verify by doing **listnetworks**.
Now you can send some packets. Try:
unicast * * ffffffffffffffff 24 60
That will do a unicast all-to-all test and report results. At first latencies might seem high, especially for a headless fake IP network. If you try it again you'll see them drop to zero or nearly so, since everyone will have executed a peer to peer connection.
multicast <some node's 10-digit ZT address> * ffffffffffffffff 24 60
This will send a multicast packet to ff:ff:ff:ff:ff:ff (broadcast) and report back who receives it. You should see multicast propagation limited to 32 nodes, since this is the setting for multicast limit on the fake test network (and the default if not overridden in netconf). Multicast will show the same "warm up" behavior as unicast.
Typing just "." will execute the same testnet command again.
The first 10-digit field of each response is the ZeroTier node doing the sending or receiving. A prefix of "----------" is used for general responses to make everything line up neatly on the screen. We recommend using a wide terminal emulator.
Enjoy!

68
attic/testnet/SimNet.cpp
View File

@ -1,68 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
#include "SimNet.hpp"
#include "../node/Constants.hpp"
#include "../node/Utils.hpp"
namespace ZeroTier {
SimNet::SimNet()
{
}
SimNet::~SimNet()
{
}
SimNetSocketManager *SimNet::newEndpoint(const InetAddress &addr)
{
Mutex::Lock _l(_lock);
if (_endpoints.size() >= ZT_SIMNET_MAX_TESTNET_SIZE)
return (SimNetSocketManager *)0;
if (_endpoints.find(addr) != _endpoints.end())
return (SimNetSocketManager *)0;
SimNetSocketManager *sm = new SimNetSocketManager();
sm->_sn = this;
sm->_address = addr;
_endpoints[addr] = sm;
return sm;
}
SimNetSocketManager *SimNet::get(const InetAddress &addr)
{
Mutex::Lock _l(_lock);
std::map< InetAddress,SimNetSocketManager * >::iterator ep(_endpoints.find(addr));
if (ep == _endpoints.end())
return (SimNetSocketManager *)0;
return ep->second;
}
} // namespace ZeroTier

71
attic/testnet/SimNet.hpp
View File

@ -1,71 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
#ifndef ZT_SIMNET_HPP
#define ZT_SIMNET_HPP
#include <map>
#include <vector>
#include "../node/Constants.hpp"
#include "../node/InetAddress.hpp"
#include "../node/Mutex.hpp"
#include "SimNetSocketManager.hpp"
#define ZT_SIMNET_MAX_TESTNET_SIZE 1048576
namespace ZeroTier {
/**
* A simulated headless IP network for testing
*/
class SimNet
{
public:
SimNet();
~SimNet();
/**
* @return New endpoint or NULL on failure
*/
SimNetSocketManager *newEndpoint(const InetAddress &addr);
/**
* @param addr Address to look up
* @return Endpoint or NULL if none
*/
SimNetSocketManager *get(const InetAddress &addr);
private:
std::map< InetAddress,SimNetSocketManager * > _endpoints;
Mutex _lock;
};
} // namespace ZeroTier
#endif

90
attic/testnet/SimNetSocketManager.cpp
View File

@ -1,90 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
#include "SimNetSocketManager.hpp"
#include "SimNet.hpp"
#include "../node/Constants.hpp"
#include "../node/Socket.hpp"
namespace ZeroTier {
class SimNetSocket : public Socket
{
public:
SimNetSocket(SimNetSocketManager *sm) :
Socket(ZT_SOCKET_TYPE_UDP_V4),
_parent(sm) {}
virtual bool send(const InetAddress &to,const void *msg,unsigned int msglen)
{
SimNetSocketManager *dest = _parent->net()->get(to);
if (dest)
dest->enqueue(_parent->address(),msg,msglen);
return true; // we emulate UDP, which has no delivery guarantee semantics
}
SimNetSocketManager *_parent;
};
SimNetSocketManager::SimNetSocketManager() :
_sn((SimNet *)0), // initialized by SimNet
_mySocket(new SimNetSocket(this))
{
}
SimNetSocketManager::~SimNetSocketManager()
{
}
bool SimNetSocketManager::send(const InetAddress &to,bool tcp,bool autoConnectTcp,const void *msg,unsigned int msglen)
{
if (tcp)
return false; // we emulate UDP
SimNetSocketManager *dest = _sn->get(to);
if (dest)
dest->enqueue(_address,msg,msglen);
return true; // we emulate UDP, which has no delivery guarantee semantics
}
void SimNetSocketManager::poll(unsigned long timeout,void (*handler)(const SharedPtr<Socket> &,void *,const InetAddress &,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> &),void *arg)
{
std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > msg;
if ((_inbox.pop(msg,timeout))&&(msg.second.size()))
handler(_mySocket,arg,msg.first,msg.second);
}
void SimNetSocketManager::whack()
{
_inbox.push(std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> >());
}
void SimNetSocketManager::closeTcpSockets()
{
}
} // namespace ZeroTier

124
attic/testnet/SimNetSocketManager.hpp
View File

@ -1,124 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
#ifndef ZT_SIMNETSOCKETMANAGER_HPP
#define ZT_SIMNETSOCKETMANAGER_HPP
#include <map>
#include <utility>
#include <vector>
#include "../node/Constants.hpp"
#include "../node/SocketManager.hpp"
#include "../node/Mutex.hpp"
#include "MTQ.hpp"
namespace ZeroTier {
class SimNet;
/**
* Socket manager for an IP endpoint in a simulated network
*/
class SimNetSocketManager : public SocketManager
{
friend class SimNet;
public:
struct TransferStats
{
TransferStats() : received(0),sent(0) {}
unsigned long long received;
unsigned long long sent;
};
SimNetSocketManager();
virtual ~SimNetSocketManager();
/**
* @return IP address of this simulated endpoint
*/
inline const InetAddress &address() const { return _address; }
/**
* @return Local endpoint stats
*/
inline const TransferStats &totals() const { return _totals; }
/**
* @param peer Peer IP address
* @return Transfer stats for this peer
*/
inline TransferStats stats(const InetAddress &peer) const
{
Mutex::Lock _l(_stats_m);
std::map< InetAddress,TransferStats >::const_iterator s(_stats.find(peer));
if (s == _stats.end())
return TransferStats();
return s->second;
}
/**
* @return Network to which this endpoint belongs
*/
inline SimNet *net() const { return _sn; }
/**
* Enqueue data from another endpoint to be picked up on next poll()
*
* @param from Originating endpoint address
* @param data Data
* @param len Length of data in bytes
*/
inline void enqueue(const InetAddress &from,const void *data,unsigned int len)
{
_inbox.push(std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> >(from,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN>(data,len)));
}
virtual bool send(const InetAddress &to,bool tcp,bool autoConnectTcp,const void *msg,unsigned int msglen);
virtual void poll(unsigned long timeout,void (*handler)(const SharedPtr<Socket> &,void *,const InetAddress &,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> &),void *arg);
virtual void whack();
virtual void closeTcpSockets();
private:
// These are set by SimNet after object creation
SimNet *_sn;
InetAddress _address;
SharedPtr<Socket> _mySocket;
TransferStats _totals;
MTQ< std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > > _inbox;
std::map< InetAddress,TransferStats > _stats;
Mutex _stats_m;
};
} // namespace ZeroTier
#endif

150
attic/testnet/TestEthernetTap.cpp
View File

@ -1,150 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
#include "TestEthernetTap.hpp"
#include "TestEthernetTapFactory.hpp"
#include "../node/Constants.hpp"
#include "../node/Utils.hpp"
#include <stdio.h>
#include <stdlib.h>
#ifdef __WINDOWS__
#include <process.h>
#else
#include <unistd.h>
#endif
namespace ZeroTier {
TestEthernetTap::TestEthernetTap(
const MAC &mac,
unsigned int mtu,
unsigned int metric,
uint64_t nwid,
const char *desiredDevice,
const char *friendlyName,
void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &),
void *arg) :
EthernetTap("TestEthernetTap",mac,mtu,metric),
_nwid(nwid),
_handler(handler),
_arg(arg),
_enabled(true)
{
static volatile unsigned int testTapCounter = 0;
char tmp[64];
int pid = 0;
#ifdef __UNIX_LIKE__
pid = (int)getpid();
#endif
#ifdef __WINDOWS__
pid = (int)_getpid();
#endif
Utils::snprintf(tmp,sizeof(tmp),"test%dtap%d",pid,testTapCounter++);
_dev = tmp;
_thread = Thread::start(this);
}
TestEthernetTap::~TestEthernetTap()
{
static const TestFrame zf; // use a static empty frame because of weirdo G++ warning bug...
_pq.push(zf); // empty frame terminates thread
Thread::join(_thread);
}
void TestEthernetTap::setEnabled(bool en)
{
_enabled = en;
}
bool TestEthernetTap::enabled() const
{
return _enabled;
}
bool TestEthernetTap::addIP(const InetAddress &ip)
{
return true;
}
bool TestEthernetTap::removeIP(const InetAddress &ip)
{
return true;
}
std::set<InetAddress> TestEthernetTap::ips() const
{
return std::set<InetAddress>();
}
void TestEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
{
_gq.push(TestFrame(from,to,data,etherType,len));
}
std::string TestEthernetTap::deviceName() const
{
return _dev;
}
void TestEthernetTap::setFriendlyName(const char *friendlyName)
{
}
bool TestEthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups)
{
return false;
}
bool TestEthernetTap::injectPacketFromHost(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
{
if ((len == 0)||(len > _mtu))
return false;
_pq.push(TestFrame(from,to,data,etherType & 0xffff,len));
return true;
}
void TestEthernetTap::threadMain()
throw()
{
TestFrame f;
for(;;) {
if (_pq.pop(f,0)) {
if (f.len) {
try {
_handler(_arg,f.from,f.to,f.etherType,Buffer<4096>(f.data,f.len));
} catch ( ... ) {}
} else break;
}
}
}
} // namespace ZeroTier

124
attic/testnet/TestEthernetTap.hpp
View File

@ -1,124 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
#ifndef ZT_TESTETHERNETTAP_HPP
#define ZT_TESTETHERNETTAP_HPP
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <string>
#include "../node/Constants.hpp"
#include "../node/EthernetTap.hpp"
#include "../node/Thread.hpp"
#include "../node/Mutex.hpp"
#include "MTQ.hpp"
namespace ZeroTier {
class TestEthernetTapFactory;
/**
* Dummy Ethernet tap
*
* This tap device prints the contents of packets it receives on stdout
* and also prints outgoing packets when they are injected. It does not
* connect to any real tap or other interface. It's useful for running
* test networks.
*/
class TestEthernetTap : public EthernetTap
{
public:
struct TestFrame
{
TestFrame() : from(),to(),timestamp(0),etherType(0),len(0) {}
TestFrame(const MAC &f,const MAC &t,const void *d,unsigned int et,unsigned int l) :
from(f),
to(t),
timestamp(Utils::now()),
etherType(et),
len(l)
{
memcpy(data,d,l);
}
MAC from;
MAC to;
uint64_t timestamp;
unsigned int etherType;
unsigned int len;
char data[4096];
};
TestEthernetTap(
const MAC &mac,
unsigned int mtu,
unsigned int metric,
uint64_t nwid,
const char *desiredDevice,
const char *friendlyName,
void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &),
void *arg);
virtual ~TestEthernetTap();
virtual void setEnabled(bool en);
virtual bool enabled() const;
virtual bool addIP(const InetAddress &ip);
virtual bool removeIP(const InetAddress &ip);
virtual std::set<InetAddress> ips() const;
virtual void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
virtual std::string deviceName() const;
virtual void setFriendlyName(const char *friendlyName);
virtual bool updateMulticastGroups(std::set<MulticastGroup> &groups);
virtual bool injectPacketFromHost(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
inline uint64_t nwid() const { return _nwid; }
inline bool getNextReceivedFrame(TestFrame &v,unsigned long timeout) { return _gq.pop(v,timeout); }
void threadMain()
throw();
private:
uint64_t _nwid;
void (*_handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &);
void *_arg;
Thread _thread;
std::string _dev;
volatile bool _enabled;
MTQ<TestFrame> _pq;
MTQ<TestFrame> _gq;
};
} // namespace ZeroTier
#endif

79
attic/testnet/TestEthernetTapFactory.cpp
View File

@ -1,79 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
#include "TestEthernetTapFactory.hpp"
#include "TestEthernetTap.hpp"
namespace ZeroTier {
TestEthernetTapFactory::TestEthernetTapFactory()
{
}
TestEthernetTapFactory::~TestEthernetTapFactory()
{
Mutex::Lock _l1(_taps_m);
Mutex::Lock _l2(_tapsByMac_m);
Mutex::Lock _l3(_tapsByNwid_m);
for(std::set<EthernetTap *>::iterator t(_taps.begin());t!=_taps.end();++t)
delete *t;
}
EthernetTap *TestEthernetTapFactory::open(
const MAC &mac,
unsigned int mtu,
unsigned int metric,
uint64_t nwid,
const char *desiredDevice,
const char *friendlyName,
void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &),
void *arg)
{
TestEthernetTap *tap = new TestEthernetTap(mac,mtu,metric,nwid,desiredDevice,friendlyName,handler,arg);
Mutex::Lock _l1(_taps_m);
Mutex::Lock _l2(_tapsByMac_m);
Mutex::Lock _l3(_tapsByNwid_m);
_taps.insert(tap);
_tapsByMac[mac] = tap;
_tapsByNwid[nwid] = tap;
return tap;
}
void TestEthernetTapFactory::close(EthernetTap *tap,bool destroyPersistentDevices)
{
Mutex::Lock _l1(_taps_m);
Mutex::Lock _l2(_tapsByMac_m);
Mutex::Lock _l3(_tapsByNwid_m);
if (!tap)
return;
_taps.erase(tap);
_tapsByMac.erase(tap->mac());
_tapsByNwid.erase(((TestEthernetTap *)tap)->nwid());
delete tap;
}
} // namespace ZeroTier

91
attic/testnet/TestEthernetTapFactory.hpp
View File

@ -1,91 +0,0 @@
/*
* ZeroTier One - Network Virtualization Everywhere
* Copyright (C) 2011-2015 ZeroTier, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* --
*
* ZeroTier may be used and distributed under the terms of the GPLv3, which
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
*
* If you would like to embed ZeroTier into a commercial application or
* redistribute it in a modified binary form, please contact ZeroTier Networks
* LLC. Start here: http://www.zerotier.com/
*/
#ifndef ZT_TESTETHERNETTAPFACTORY_HPP
#define ZT_TESTETHERNETTAPFACTORY_HPP
#include <vector>
#include <string>
#include <set>
#include "../node/EthernetTapFactory.hpp"
#include "../node/Mutex.hpp"
#include "../node/MAC.hpp"
#include "TestEthernetTap.hpp"
namespace ZeroTier {
class TestEthernetTapFactory : public EthernetTapFactory
{
public:
TestEthernetTapFactory();
virtual ~TestEthernetTapFactory();
virtual EthernetTap *open(
const MAC &mac,
unsigned int mtu,
unsigned int metric,
uint64_t nwid,
const char *desiredDevice,
const char *friendlyName,
void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &),
void *arg);
virtual void close(EthernetTap *tap,bool destroyPersistentDevices);
inline TestEthernetTap *getByMac(const MAC &mac) const
{
Mutex::Lock _l(_tapsByMac_m);
std::map< MAC,TestEthernetTap * >::const_iterator t(_tapsByMac.find(mac));
if (t == _tapsByMac.end())
return (TestEthernetTap *)0;
return t->second;
}
inline TestEthernetTap *getByNwid(uint64_t nwid) const
{
Mutex::Lock _l(_tapsByNwid_m);
std::map< uint64_t,TestEthernetTap * >::const_iterator t(_tapsByNwid.find(nwid));
if (t == _tapsByNwid.end())
return (TestEthernetTap *)0;
return t->second;
}
private:
std::set< EthernetTap * > _taps;
Mutex _taps_m;
std::map< MAC,TestEthernetTap * > _tapsByMac;
Mutex _tapsByMac_m;
std::map< uint64_t,TestEthernetTap * > _tapsByNwid;
Mutex _tapsByNwid_m;
};
} // namespace ZeroTier
#endif

37
node/IncomingPacket.cpp
View File

@ -179,11 +179,9 @@ bool IncomingPacket::_doHELLO(const RuntimeEnvironment *RR)
Identity id; Identity id;
unsigned int destAddrPtr = id.deserialize(*this,ZT_PROTO_VERB_HELLO_IDX_IDENTITY) + ZT_PROTO_VERB_HELLO_IDX_IDENTITY; unsigned int destAddrPtr = id.deserialize(*this,ZT_PROTO_VERB_HELLO_IDX_IDENTITY) + ZT_PROTO_VERB_HELLO_IDX_IDENTITY;
unsigned int destAddrType = ZT_PROTO_DEST_ADDRESS_TYPE_NONE;
if (destAddrPtr < size()) // ZeroTier One < 1.0.3 did not include this field
destAddrType = (*this)[destAddrPtr++];
InetAddress destAddr; InetAddress destAddr;
if (destAddrPtr < size()) { // ZeroTier One < 1.0.3 did not include this field
const unsigned int destAddrType = (*this)[destAddrPtr++];
switch(destAddrType) { switch(destAddrType) {
case ZT_PROTO_DEST_ADDRESS_TYPE_IPV4: case ZT_PROTO_DEST_ADDRESS_TYPE_IPV4:
destAddr.set(field(destAddrPtr,4),4,at<uint16_t>(destAddrPtr + 4)); destAddr.set(field(destAddrPtr,4),4,at<uint16_t>(destAddrPtr + 4));
@ -192,6 +190,7 @@ bool IncomingPacket::_doHELLO(const RuntimeEnvironment *RR)
destAddr.set(field(destAddrPtr,16),16,at<uint16_t>(destAddrPtr + 16)); destAddr.set(field(destAddrPtr,16),16,at<uint16_t>(destAddrPtr + 16));
break; break;
} }
}
if (source() != id.address()) { if (source() != id.address()) {
TRACE("dropped HELLO from %s(%s): identity not for sending address",source().toString().c_str(),_remoteAddress.toString().c_str()); TRACE("dropped HELLO from %s(%s): identity not for sending address",source().toString().c_str(),_remoteAddress.toString().c_str());
@ -268,12 +267,13 @@ bool IncomingPacket::_doHELLO(const RuntimeEnvironment *RR)
peer->received(RR,_remoteAddress,_linkDesperation,hops(),packetId(),Packet::VERB_HELLO,0,Packet::VERB_NOP); peer->received(RR,_remoteAddress,_linkDesperation,hops(),packetId(),Packet::VERB_HELLO,0,Packet::VERB_NOP);
peer->setRemoteVersion(protoVersion,vMajor,vMinor,vRevision); peer->setRemoteVersion(protoVersion,vMajor,vMinor,vRevision);
bool trusted = false;
if (RR->topology->isSupernode(id.address())) { if (RR->topology->isSupernode(id.address())) {
RR->node->postNewerVersionIfNewer(vMajor,vMinor,vRevision); RR->node->postNewerVersionIfNewer(vMajor,vMinor,vRevision);
RR->sa->iam(id.address(),_remoteAddress,destAddr,true); trusted = true;
} else {
RR->sa->iam(id.address(),_remoteAddress,destAddr,false);
} }
if (destAddr)
RR->sa->iam(id.address(),_remoteAddress,destAddr,trusted);
Packet outp(id.address(),RR->identity.address(),Packet::VERB_OK); Packet outp(id.address(),RR->identity.address(),Packet::VERB_OK);
@ -328,18 +328,37 @@ bool IncomingPacket::_doOK(const RuntimeEnvironment *RR,const SharedPtr<Peer> &p
const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION]; const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION];
const unsigned int vRevision = at<uint16_t>(ZT_PROTO_VERB_HELLO__OK__IDX_REVISION); const unsigned int vRevision = at<uint16_t>(ZT_PROTO_VERB_HELLO__OK__IDX_REVISION);
InetAddress destAddr;
unsigned int destAddrPtr = ZT_PROTO_VERB_HELLO__OK__IDX_REVISION + 2; // dest address, if present, will start after 16-bit revision
if (destAddrPtr < size()) { // ZeroTier One < 1.0.3 did not include this field
const unsigned int destAddrType = (*this)[destAddrPtr++];
switch(destAddrType) {
case ZT_PROTO_DEST_ADDRESS_TYPE_IPV4:
destAddr.set(field(destAddrPtr,4),4,at<uint16_t>(destAddrPtr + 4));
break;
case ZT_PROTO_DEST_ADDRESS_TYPE_IPV6:
destAddr.set(field(destAddrPtr,16),16,at<uint16_t>(destAddrPtr + 16));
break;
}
}
if (vProto < ZT_PROTO_VERSION_MIN) { if (vProto < ZT_PROTO_VERSION_MIN) {
TRACE("%s(%s): OK(HELLO) dropped, protocol version too old",source().toString().c_str(),_remoteAddress.toString().c_str()); TRACE("%s(%s): OK(HELLO) dropped, protocol version too old",source().toString().c_str(),_remoteAddress.toString().c_str());
return true; return true;
} }
TRACE("%s(%s): OK(HELLO), version %u.%u.%u, latency %u",source().toString().c_str(),_remoteAddress.toString().c_str(),vMajor,vMinor,vRevision,latency); TRACE("%s(%s): OK(HELLO), version %u.%u.%u, latency %u, reported external address %s",source().toString().c_str(),_remoteAddress.toString().c_str(),vMajor,vMinor,vRevision,latency,((destAddr) ? destAddr.toString().c_str() : "(none)"));
peer->addDirectLatencyMeasurment(latency); peer->addDirectLatencyMeasurment(latency);
peer->setRemoteVersion(vProto,vMajor,vMinor,vRevision); peer->setRemoteVersion(vProto,vMajor,vMinor,vRevision);
if (RR->topology->isSupernode(peer->address())) bool trusted = false;
if (RR->topology->isSupernode(peer->address())) {
RR->node->postNewerVersionIfNewer(vMajor,vMinor,vRevision); RR->node->postNewerVersionIfNewer(vMajor,vMinor,vRevision);
trusted = true;
}
if (destAddr)
RR->sa->iam(peer->address(),_remoteAddress,destAddr,trusted);
} break; } break;
case Packet::VERB_WHOIS: { case Packet::VERB_WHOIS: {

22
node/Node.cpp
View File

@ -59,7 +59,8 @@ Node::Node(
ZT1_VirtualNetworkConfigFunction virtualNetworkConfigFunction, ZT1_VirtualNetworkConfigFunction virtualNetworkConfigFunction,
ZT1_EventCallback eventCallback, ZT1_EventCallback eventCallback,
const char *overrideRootTopology) : const char *overrideRootTopology) :
RR(new RuntimeEnvironment(this)), _RR(this),
RR(&_RR),
_uPtr(uptr), _uPtr(uptr),
_dataStoreGetFunction(dataStoreGetFunction), _dataStoreGetFunction(dataStoreGetFunction),
_dataStorePutFunction(dataStorePutFunction), _dataStorePutFunction(dataStorePutFunction),
@ -86,19 +87,18 @@ Node::Node(
TRACE("identity.secret not found, generating..."); TRACE("identity.secret not found, generating...");
RR->identity.generate(); RR->identity.generate();
idtmp = RR->identity.toString(true); idtmp = RR->identity.toString(true);
if (!dataStorePut("identity.secret",idtmp,true)) { if (!dataStorePut("identity.secret",idtmp,true))
delete RR;
throw std::runtime_error("unable to write identity.secret"); throw std::runtime_error("unable to write identity.secret");
} }
idtmp = RR->identity.toString(false);
if (!dataStorePut("identity.public",idtmp,false)) {
delete RR;
throw std::runtime_error("unable to write identity.public");
}
}
RR->publicIdentityStr = RR->identity.toString(false); RR->publicIdentityStr = RR->identity.toString(false);
RR->secretIdentityStr = RR->identity.toString(true); RR->secretIdentityStr = RR->identity.toString(true);
idtmp = dataStoreGet("identity.public");
if (idtmp != RR->publicIdentityStr) {
if (!dataStorePut("identity.public",RR->publicIdentityStr,false))
throw std::runtime_error("unable to write identity.public");
}
try { try {
RR->prng = new CMWC4096(); RR->prng = new CMWC4096();
RR->sw = new Switch(RR); RR->sw = new Switch(RR);
@ -113,7 +113,6 @@ Node::Node(
delete RR->mc; delete RR->mc;
delete RR->sw; delete RR->sw;
delete RR->prng; delete RR->prng;
delete RR;
throw; throw;
} }
@ -138,14 +137,13 @@ Node::Node(
Node::~Node() Node::~Node()
{ {
Mutex::Lock _l(_networks_m); Mutex::Lock _l(_networks_m);
_networks.clear(); // delete these before we delete RR _networks.clear();
delete RR->sa; delete RR->sa;
delete RR->topology; delete RR->topology;
delete RR->antiRec; delete RR->antiRec;
delete RR->mc; delete RR->mc;
delete RR->sw; delete RR->sw;
delete RR->prng; delete RR->prng;
delete RR;
} }
ZT1_ResultCode Node::processWirePacket( ZT1_ResultCode Node::processWirePacket(

4
node/Node.hpp
View File

@ -38,6 +38,7 @@
#include "../include/ZeroTierOne.h" #include "../include/ZeroTierOne.h"
#include "RuntimeEnvironment.hpp"
#include "InetAddress.hpp" #include "InetAddress.hpp"
#include "Mutex.hpp" #include "Mutex.hpp"
#include "MAC.hpp" #include "MAC.hpp"
@ -52,8 +53,6 @@
namespace ZeroTier { namespace ZeroTier {
class RuntimeEnvironment;
/** /**
* Implementation of Node object as defined in CAPI * Implementation of Node object as defined in CAPI
* *
@ -229,6 +228,7 @@ public:
#endif #endif
private: private:
RuntimeEnvironment _RR;
RuntimeEnvironment *RR; RuntimeEnvironment *RR;
void *_uPtr; // _uptr (lower case) is reserved in Visual Studio :P void *_uPtr; // _uptr (lower case) is reserved in Visual Studio :P

2
root-topology/Makefile
View File

@ -1,5 +1,5 @@
all: FORCE all: FORCE
g++ -o mktopology mktopology.cpp ../node/Utils.cpp ../node/Identity.cpp ../node/C25519.cpp ../node/Salsa20.cpp ../node/Dictionary.cpp ../node/SHA512.cpp g++ -o mktopology mktopology.cpp ../osdep/OSUtils.cpp ../node/Utils.cpp ../node/InetAddress.cpp ../node/Identity.cpp ../node/C25519.cpp ../node/Salsa20.cpp ../node/Dictionary.cpp ../node/SHA512.cpp
gcc -o bin2c bin2c.c gcc -o bin2c bin2c.c
official: FORCE official: FORCE

29
root-topology/mktopology.cpp
View File

@ -6,7 +6,7 @@
#include <iostream> #include <iostream>
#include <map> #include <map>
#include "../node/Utils.hpp" #include "../osdep/OSUtils.hpp"
#include "../node/Identity.hpp" #include "../node/Identity.hpp"
#include "../node/Dictionary.hpp" #include "../node/Dictionary.hpp"
@ -17,38 +17,38 @@ int main(int argc,char **argv)
std::string buf; std::string buf;
// Read root-topology-authority.secret signing authority, must be symlinked and online // Read root-topology-authority.secret signing authority, must be symlinked and online
if (!Utils::readFile("root-topology-authority.secret",buf)) { Identity topologyAuthority;
std::cerr << "Cannot read root-topology-authority.secret" << std::endl; if (OSUtils::readFile("root-topology-authority.secret",buf))
return 1; topologyAuthority.fromString(buf);
} else std::cerr << "Warning: root-topology-authority.secret not found, creating unsigned topology." << std::endl;
Identity topologyAuthority(buf);
Dictionary topology; Dictionary topology;
// Read template.dict to populate default fields in root topology // Read template.dict to populate default fields in root topology
// if this file exists. Otherwise we just start empty. // if this file exists. Otherwise we just start empty.
buf.clear(); buf.clear();
if (Utils::readFile("template.dict",buf)) if (OSUtils::readFile("template.dict",buf))
topology.fromString(buf); topology.fromString(buf);
// Read all entries in supernodes/ that correspond to supernode entry dictionaries // Read all entries in supernodes/ that correspond to supernode entry dictionaries
// and add them to topology under supernodes/ subkey. // and add them to topology under supernodes/ subkey.
Dictionary supernodes; Dictionary supernodes;
std::map<std::string,bool> supernodeDictionaries(Utils::listDirectory("supernodes")); std::vector<std::string> supernodeDictionaries(OSUtils::listDirectory("supernodes"));
for(std::map<std::string,bool>::iterator sn(supernodeDictionaries.begin());sn!=supernodeDictionaries.end();++sn) { for(std::vector<std::string>::const_iterator sn(supernodeDictionaries.begin());sn!=supernodeDictionaries.end();++sn) {
if ((sn->first.length() == 10)&&(!sn->second)) { if (sn->length() == 10) {
buf.clear(); buf.clear();
if (!Utils::readFile((std::string("supernodes/")+sn->first).c_str(),buf)) { if (!OSUtils::readFile((std::string("supernodes/")+(*sn)).c_str(),buf)) {
std::cerr << "Cannot read supernodes/" << sn->first << std::endl; std::cerr << "Cannot read supernodes/" << *sn << std::endl;
return 1; return 1;
} }
supernodes[sn->first] = buf; supernodes[*sn] = buf;
} }
} }
topology["supernodes"] = supernodes.toString(); topology["supernodes"] = supernodes.toString();
if ((topologyAuthority)&&(topologyAuthority.hasPrivate())) {
// Sign topology with root-topology-authority.secret // Sign topology with root-topology-authority.secret
if (!topology.sign(topologyAuthority)) { if (!topology.sign(topologyAuthority,OSUtils::now())) {
std::cerr << "Unable to sign!" << std::endl; std::cerr << "Unable to sign!" << std::endl;
return 1; return 1;
} }
@ -59,6 +59,7 @@ int main(int argc,char **argv)
std::cerr << "Test verification of signed dictionary failed!" << std::endl; std::cerr << "Test verification of signed dictionary failed!" << std::endl;
return 1; return 1;
} }
}
// Output to stdout // Output to stdout
std::cout << topology.toString(); std::cout << topology.toString();

6
root-topology/test/README.md Normal file
View File

@ -0,0 +1,6 @@
Test Root Topology Script
======
This builds a test-root-topology from any number of running test-supernode-# Docker containers. This can then be used with the (undocumented) -T (override root topology) option to run test networks under Docker.
Once you have a local Docker test network running you can use iptables rules to simulate a variety of network pathologies, or you can just use it to test any new changes to the protocol or node behavior at some limited scale.

31
root-topology/test/create-test-root-topology.sh Executable file
View File

@ -0,0 +1,31 @@
#!/bin/bash
if [ ! -e ../mktopology ]; then
echo 'Build ../mktopology first!'
exit 1
fi
echo 'Populating supernodes/* with all Docker test-supernode-* container IPs and identities...'
rm -rf supernodes
mkdir supernodes
for cid in `docker ps -f 'name=test-supernode-*' -q`; do
id=`docker exec $cid cat /var/lib/zerotier-one/identity.secret | cut -d : -f 1-3`
ztaddr=`echo $id | cut -d : -f 1`
ip=`docker exec $cid ifconfig | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p'`
echo $cid $ztaddr $id $ip
echo "id=$id" >supernodes/$ztaddr
echo "udp=$ip/9993" >>supernodes/$ztaddr
done
echo 'Creating test-root-topology...'
rm -f test-root-topology
../mktopology >test-root-topology
echo 'Done!'
echo
cat test-root-topology
exit 0

16
service/ControlPlane.cpp
View File

@ -71,13 +71,13 @@ static std::string _jsonEnumerate(const ZT1_MulticastGroup *mg,unsigned int coun
if (i > 0) if (i > 0)
buf.push_back(','); buf.push_back(',');
Utils::snprintf(tmp,sizeof(tmp),"\"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\\/%.8lx\"", Utils::snprintf(tmp,sizeof(tmp),"\"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\\/%.8lx\"",
(unsigned int)((mg->mac >> 40) & 0xff), (unsigned int)((mg[i].mac >> 40) & 0xff),
(unsigned int)((mg->mac >> 32) & 0xff), (unsigned int)((mg[i].mac >> 32) & 0xff),
(unsigned int)((mg->mac >> 24) & 0xff), (unsigned int)((mg[i].mac >> 24) & 0xff),
(unsigned int)((mg->mac >> 16) & 0xff), (unsigned int)((mg[i].mac >> 16) & 0xff),
(unsigned int)((mg->mac >> 8) & 0xff), (unsigned int)((mg[i].mac >> 8) & 0xff),
(unsigned int)(mg->mac & 0xff), (unsigned int)(mg[i].mac & 0xff),
mg->adi); (unsigned long)(mg[i].adi));
buf.append(tmp); buf.append(tmp);
} }
buf.push_back(']'); buf.push_back(']');
@ -92,7 +92,7 @@ static std::string _jsonEnumerate(const struct sockaddr_storage *ss,unsigned int
if (i > 0) if (i > 0)
buf.push_back(','); buf.push_back(',');
buf.push_back('"'); buf.push_back('"');
buf.append(_jsonEscape(reinterpret_cast<const InetAddress *>(ss)->toString())); buf.append(_jsonEscape(reinterpret_cast<const InetAddress *>(&(ss[i]))->toString()));
buf.push_back('"'); buf.push_back('"');
} }
buf.push_back(']'); buf.push_back(']');

319
service/OneService.cpp
View File

@ -113,17 +113,20 @@ static const struct http_parser_settings HTTP_PARSER_SETTINGS = {
ShttpOnMessageComplete ShttpOnMessageComplete
}; };
struct HttpConnection struct TcpConnection
{ {
bool server; enum {
bool writing; TCP_HTTP_INCOMING,
TCP_HTTP_OUTGOING, // not currently used
TCP_TUNNEL_OUTGOING // fale-SSL outgoing tunnel -- HTTP-related fields are not used
} type;
bool shouldKeepAlive; bool shouldKeepAlive;
OneServiceImpl *parent; OneServiceImpl *parent;
PhySocket *sock; PhySocket *sock;
InetAddress from; InetAddress from;
http_parser parser; http_parser parser;
unsigned long messageSize; unsigned long messageSize;
unsigned long writePtr;
uint64_t lastActivity; uint64_t lastActivity;
std::string currentHeaderField; std::string currentHeaderField;
@ -132,7 +135,9 @@ struct HttpConnection
std::string url; std::string url;
std::string status; std::string status;
std::map< std::string,std::string > headers; std::map< std::string,std::string > headers;
std::string body; // also doubles as send queue for writes out to the socket std::string body;
std::string writeBuf;
}; };
class OneServiceImpl : public OneService class OneServiceImpl : public OneService
@ -281,8 +286,8 @@ public:
} }
try { try {
while (!_httpConnections.empty()) while (!_tcpConections.empty())
_phy.close(_httpConnections.begin()->first); _phy.close(_tcpConections.begin()->first);
} catch ( ... ) {} } catch ( ... ) {}
{ {
@ -336,13 +341,13 @@ public:
ZT1_ResultCode rc = _node->processWirePacket( ZT1_ResultCode rc = _node->processWirePacket(
OSUtils::now(), OSUtils::now(),
(const struct sockaddr_storage *)from, // Phy<> uses sockaddr_storage, so it'll always be that big (const struct sockaddr_storage *)from, // Phy<> uses sockaddr_storage, so it'll always be that big
0, 0, // desperation == 0, direct UDP
data, data,
len, len,
&_nextBackgroundTaskDeadline); &_nextBackgroundTaskDeadline);
if (ZT1_ResultCode_isFatal(rc)) { if (ZT1_ResultCode_isFatal(rc)) {
char tmp[256]; char tmp[256];
Utils::snprintf(tmp,sizeof(tmp),"fatal error code from processWirePacket(%d)",(int)rc); Utils::snprintf(tmp,sizeof(tmp),"fatal error code from processWirePacket: %d",(int)rc);
Mutex::Lock _l(_termReason_m); Mutex::Lock _l(_termReason_m);
_termReason = ONE_UNRECOVERABLE_ERROR; _termReason = ONE_UNRECOVERABLE_ERROR;
_fatalErrorMessage = tmp; _fatalErrorMessage = tmp;
@ -352,65 +357,165 @@ public:
inline void phyOnTcpConnect(PhySocket *sock,void **uptr,bool success) inline void phyOnTcpConnect(PhySocket *sock,void **uptr,bool success)
{ {
// TODO: outgoing HTTP connection success/failure if (!success)
return;
// Outgoing connections are right now only tunnel connections
TcpConnection *tc = &(_tcpConections[sock]);
tc->type = TcpConnection::TCP_TUNNEL_OUTGOING;
tc->shouldKeepAlive = true; // unused
tc->parent = this;
tc->sock = sock;
// from and parser are not used
tc->messageSize = 0; // unused
tc->lastActivity = OSUtils::now();
// HTTP stuff is not used
tc->writeBuf = "";
*uptr = (void *)tc;
// Send "hello" message
tc->writeBuf.push_back((char)0x17);
tc->writeBuf.push_back((char)0x03);
tc->writeBuf.push_back((char)0x03); // fake TLS 1.2 header
tc->writeBuf.push_back((char)0x00);
tc->writeBuf.push_back((char)0x04); // mlen == 4
tc->writeBuf.push_back((char)ZEROTIER_ONE_VERSION_MAJOR);
tc->writeBuf.push_back((char)ZEROTIER_ONE_VERSION_MINOR);
tc->writeBuf.push_back((char)((ZEROTIER_ONE_VERSION_REVISION >> 8) & 0xff));
tc->writeBuf.push_back((char)(ZEROTIER_ONE_VERSION_REVISION & 0xff));
_phy.tcpSetNotifyWritable(sock,true);
} }
inline void phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from) inline void phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from)
{ {
HttpConnection *htc = &(_httpConnections[sockN]); // Incoming connections are TCP HTTP requests
htc->server = true; TcpConnection *tc = &(_tcpConections[sockN]);
htc->writing = false; tc->type = TcpConnection::TCP_HTTP_INCOMING;
htc->shouldKeepAlive = true; tc->shouldKeepAlive = true;
htc->parent = this; tc->parent = this;
htc->sock = sockN; tc->sock = sockN;
htc->from = from; tc->from = from;
http_parser_init(&(htc->parser),HTTP_REQUEST); http_parser_init(&(tc->parser),HTTP_REQUEST);
htc->parser.data = (void *)htc; tc->parser.data = (void *)tc;
htc->messageSize = 0; tc->messageSize = 0;
htc->writePtr = 0; tc->lastActivity = OSUtils::now();
htc->lastActivity = OSUtils::now(); tc->currentHeaderField = "";
htc->currentHeaderField = ""; tc->currentHeaderValue = "";
htc->currentHeaderValue = ""; tc->url = "";
htc->url = ""; tc->status = "";
htc->status = ""; tc->headers.clear();
htc->headers.clear(); tc->body = "";
htc->body = ""; tc->writeBuf = "";
*uptrN = (void *)htc; *uptrN = (void *)tc;
} }
inline void phyOnTcpClose(PhySocket *sock,void **uptr) inline void phyOnTcpClose(PhySocket *sock,void **uptr)
{ {
_httpConnections.erase(sock); _tcpConections.erase(sock);
} }
inline void phyOnTcpData(PhySocket *sock,void **uptr,void *data,unsigned long len) inline void phyOnTcpData(PhySocket *sock,void **uptr,void *data,unsigned long len)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(*uptr); TcpConnection *tc = reinterpret_cast<TcpConnection *>(*uptr);
http_parser_execute(&(htc->parser),&HTTP_PARSER_SETTINGS,(const char *)data,len); switch(tc->type) {
if ((htc->parser.upgrade)||(htc->parser.http_errno != HPE_OK)) case TcpConnection::TCP_HTTP_INCOMING:
case TcpConnection::TCP_HTTP_OUTGOING:
http_parser_execute(&(tc->parser),&HTTP_PARSER_SETTINGS,(const char *)data,len);
if ((tc->parser.upgrade)||(tc->parser.http_errno != HPE_OK)) {
_phy.close(sock); _phy.close(sock);
return;
}
break;
case TcpConnection::TCP_TUNNEL_OUTGOING:
tc->body.append((const char *)data,len);
if (tc->body.length() > 65535) {
// sanity limit -- a message will never be this big since mlen is 16-bit
_phy.close(sock);
return;
} else if (tc->body.length() >= 5) {
const char *data = tc->body.data();
const unsigned long mlen = ( ((((unsigned long)data[3]) & 0xff) << 8) | (((unsigned long)data[4]) & 0xff) );
if (tc->body.length() >= (mlen + 5)) {
InetAddress from;
unsigned long plen = mlen; // payload length, modified if there's an IP header
data += 5; // skip forward past pseudo-TLS junk and mlen
if (plen == 4) {
// Hello message, which isn't sent by proxy and would be ignored by client
} else if (plen) {
// Messages should contain IPv4 or IPv6 source IP address data
switch(data[0]) {
case 4: // IPv4
if (plen >= 7) {
from.set((const void *)(data + 1),4,((((unsigned int)data[5]) & 0xff) << 8) | (((unsigned int)data[6]) & 0xff));
data += 7; // type + 4 byte IP + 2 byte port
plen -= 7;
} else {
_phy.close(sock);
return;
}
break;
case 6: // IPv6
if (plen >= 19) {
from.set((const void *)(data + 1),16,((((unsigned int)data[17]) & 0xff) << 8) | (((unsigned int)data[18]) & 0xff));
data += 19; // type + 16 byte IP + 2 byte port
plen -= 19;
} else {
_phy.close(sock);
return;
}
break;
case 0: // none/omitted
++data;
--plen;
break;
default: // invalid address type
_phy.close(sock);
return;
}
ZT1_ResultCode rc = _node->processWirePacket(
OSUtils::now(),
(const struct sockaddr_storage *)&from, // Phy<> uses sockaddr_storage, so it'll always be that big
1, // desperation == 1, TCP tunnel proxy
data,
plen,
&_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();
_phy.close(sock);
return;
}
}
if (tc->body.length() > (mlen + 5))
tc->body = tc->body.substr(mlen + 5);
else tc->body = "";
}
}
break;
}
} }
inline void phyOnTcpWritable(PhySocket *sock,void **uptr) inline void phyOnTcpWritable(PhySocket *sock,void **uptr)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(*uptr); TcpConnection *tc = reinterpret_cast<TcpConnection *>(*uptr);
long sent = _phy.tcpSend(sock,htc->body.data() + htc->writePtr,(unsigned long)htc->body.length() - htc->writePtr,true); if (tc->writeBuf.length()) {
if (sent < 0) { long sent = _phy.tcpSend(sock,tc->writeBuf.data(),tc->writeBuf.length(),true);
return; // close handler will have been called, so everything's dead if (sent > 0) {
} else { tc->lastActivity = OSUtils::now();
htc->lastActivity = OSUtils::now(); if (sent == tc->writeBuf.length()) {
htc->writePtr += sent; tc->writeBuf = "";
if (htc->writePtr >= htc->body.length()) {
_phy.tcpSetNotifyWritable(sock,false); _phy.tcpSetNotifyWritable(sock,false);
if (htc->shouldKeepAlive) { if (!tc->shouldKeepAlive)
htc->writing = false; _phy.close(sock); // will call close handler to delete from _tcpConections
htc->writePtr = 0; } else tc->writeBuf = tc->writeBuf.substr(sent);
htc->body = "";
} else {
_phy.close(sock); // will call close handler to delete from _httpConnections
}
}
} }
} else _phy.tcpSetNotifyWritable(sock,false); // sanity check... shouldn't happen
} }
inline int nodeVirtualNetworkConfigFunction(uint64_t nwid,enum ZT1_VirtualNetworkConfigOperation op,const ZT1_VirtualNetworkConfig *nwc) inline int nodeVirtualNetworkConfigFunction(uint64_t nwid,enum ZT1_VirtualNetworkConfigOperation op,const ZT1_VirtualNetworkConfig *nwc)
@ -586,7 +691,7 @@ public:
_node->processVirtualNetworkFrame(OSUtils::now(),nwid,from.toInt(),to.toInt(),etherType,vlanId,data,len,&_nextBackgroundTaskDeadline); _node->processVirtualNetworkFrame(OSUtils::now(),nwid,from.toInt(),to.toInt(),etherType,vlanId,data,len,&_nextBackgroundTaskDeadline);
} }
inline void onHttpRequestToServer(HttpConnection *htc) inline void onHttpRequestToServer(TcpConnection *tc)
{ {
char tmpn[256]; char tmpn[256];
std::string data; std::string data;
@ -595,7 +700,7 @@ public:
try { try {
if (_controlPlane) if (_controlPlane)
scode = _controlPlane->handleRequest(htc->from,htc->parser.method,htc->url,htc->headers,htc->body,data,contentType); scode = _controlPlane->handleRequest(tc->from,tc->parser.method,tc->url,tc->headers,tc->body,data,contentType);
else scode = 500; else scode = 500;
} catch ( ... ) { } catch ( ... ) {
scode = 500; scode = 500;
@ -615,26 +720,24 @@ public:
} }
Utils::snprintf(tmpn,sizeof(tmpn),"HTTP/1.1 %.3u %s\r\nCache-Control: no-cache\r\nPragma: no-cache\r\n",scode,scodestr); Utils::snprintf(tmpn,sizeof(tmpn),"HTTP/1.1 %.3u %s\r\nCache-Control: no-cache\r\nPragma: no-cache\r\n",scode,scodestr);
htc->body.assign(tmpn); tc->writeBuf.assign(tmpn);
htc->body.append("Content-Type: "); tc->writeBuf.append("Content-Type: ");
htc->body.append(contentType); tc->writeBuf.append(contentType);
Utils::snprintf(tmpn,sizeof(tmpn),"\r\nContent-Length: %lu\r\n",(unsigned long)data.length()); Utils::snprintf(tmpn,sizeof(tmpn),"\r\nContent-Length: %lu\r\n",(unsigned long)data.length());
htc->body.append(tmpn); tc->writeBuf.append(tmpn);
if (!htc->shouldKeepAlive) if (!tc->shouldKeepAlive)
htc->body.append("Connection: close\r\n"); tc->writeBuf.append("Connection: close\r\n");
htc->body.append("\r\n"); tc->writeBuf.append("\r\n");
if (htc->parser.method != HTTP_HEAD) if (tc->parser.method != HTTP_HEAD)
htc->body.append(data); tc->writeBuf.append(data);
htc->writing = true; _phy.tcpSetNotifyWritable(tc->sock,true);
htc->writePtr = 0;
_phy.tcpSetNotifyWritable(htc->sock,true);
} }
inline void onHttpResponseFromClient(HttpConnection *htc) inline void onHttpResponseFromClient(TcpConnection *tc)
{ {
if (!htc->shouldKeepAlive) if (!tc->shouldKeepAlive)
_phy.close(htc->sock); // will call close handler, which deletes from _httpConnections _phy.close(tc->sock); // will call close handler, which deletes from _tcpConections
} }
private: private:
@ -671,7 +774,7 @@ private:
std::map< uint64_t,std::vector<InetAddress> > _tapAssignedIps; // ZeroTier assigned IPs, not user or dhcp assigned std::map< uint64_t,std::vector<InetAddress> > _tapAssignedIps; // ZeroTier assigned IPs, not user or dhcp assigned
Mutex _taps_m; Mutex _taps_m;
std::map< PhySocket *,HttpConnection > _httpConnections; // no mutex for this since it's done in the main loop thread only std::map< PhySocket *,TcpConnection > _tcpConections; // no mutex for this since it's done in the main loop thread only
ReasonForTermination _termReason; ReasonForTermination _termReason;
std::string _fatalErrorMessage; std::string _fatalErrorMessage;
@ -699,83 +802,83 @@ static void StapFrameHandler(void *uptr,uint64_t nwid,const MAC &from,const MAC
static int ShttpOnMessageBegin(http_parser *parser) static int ShttpOnMessageBegin(http_parser *parser)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(parser->data); TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
htc->currentHeaderField = ""; tc->currentHeaderField = "";
htc->currentHeaderValue = ""; tc->currentHeaderValue = "";
htc->messageSize = 0; tc->messageSize = 0;
htc->url = ""; tc->url = "";
htc->status = ""; tc->status = "";
htc->headers.clear(); tc->headers.clear();
htc->body = ""; tc->body = "";
return 0; return 0;
} }
static int ShttpOnUrl(http_parser *parser,const char *ptr,size_t length) static int ShttpOnUrl(http_parser *parser,const char *ptr,size_t length)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(parser->data); TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
htc->messageSize += (unsigned long)length; tc->messageSize += (unsigned long)length;
if (htc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE) if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
return -1; return -1;
htc->url.append(ptr,length); tc->url.append(ptr,length);
return 0; return 0;
} }
static int ShttpOnStatus(http_parser *parser,const char *ptr,size_t length) static int ShttpOnStatus(http_parser *parser,const char *ptr,size_t length)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(parser->data); TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
htc->messageSize += (unsigned long)length; tc->messageSize += (unsigned long)length;
if (htc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE) if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
return -1; return -1;
htc->status.append(ptr,length); tc->status.append(ptr,length);
return 0; return 0;
} }
static int ShttpOnHeaderField(http_parser *parser,const char *ptr,size_t length) static int ShttpOnHeaderField(http_parser *parser,const char *ptr,size_t length)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(parser->data); TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
htc->messageSize += (unsigned long)length; tc->messageSize += (unsigned long)length;
if (htc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE) if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
return -1; return -1;
if ((htc->currentHeaderField.length())&&(htc->currentHeaderValue.length())) { if ((tc->currentHeaderField.length())&&(tc->currentHeaderValue.length())) {
htc->headers[htc->currentHeaderField] = htc->currentHeaderValue; tc->headers[tc->currentHeaderField] = tc->currentHeaderValue;
htc->currentHeaderField = ""; tc->currentHeaderField = "";
htc->currentHeaderValue = ""; tc->currentHeaderValue = "";
} }
for(size_t i=0;i<length;++i) for(size_t i=0;i<length;++i)
htc->currentHeaderField.push_back(OSUtils::toLower(ptr[i])); tc->currentHeaderField.push_back(OSUtils::toLower(ptr[i]));
return 0; return 0;
} }
static int ShttpOnValue(http_parser *parser,const char *ptr,size_t length) static int ShttpOnValue(http_parser *parser,const char *ptr,size_t length)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(parser->data); TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
htc->messageSize += (unsigned long)length; tc->messageSize += (unsigned long)length;
if (htc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE) if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
return -1; return -1;
htc->currentHeaderValue.append(ptr,length); tc->currentHeaderValue.append(ptr,length);
return 0; return 0;
} }
static int ShttpOnHeadersComplete(http_parser *parser) static int ShttpOnHeadersComplete(http_parser *parser)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(parser->data); TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
if ((htc->currentHeaderField.length())&&(htc->currentHeaderValue.length())) if ((tc->currentHeaderField.length())&&(tc->currentHeaderValue.length()))
htc->headers[htc->currentHeaderField] = htc->currentHeaderValue; tc->headers[tc->currentHeaderField] = tc->currentHeaderValue;
return 0; return 0;
} }
static int ShttpOnBody(http_parser *parser,const char *ptr,size_t length) static int ShttpOnBody(http_parser *parser,const char *ptr,size_t length)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(parser->data); TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
htc->messageSize += (unsigned long)length; tc->messageSize += (unsigned long)length;
if (htc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE) if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
return -1; return -1;
htc->body.append(ptr,length); tc->body.append(ptr,length);
return 0; return 0;
} }
static int ShttpOnMessageComplete(http_parser *parser) static int ShttpOnMessageComplete(http_parser *parser)
{ {
HttpConnection *htc = reinterpret_cast<HttpConnection *>(parser->data); TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
htc->shouldKeepAlive = (http_should_keep_alive(parser) != 0); tc->shouldKeepAlive = (http_should_keep_alive(parser) != 0);
htc->lastActivity = OSUtils::now(); tc->lastActivity = OSUtils::now();
if (htc->server) { if (tc->type == TcpConnection::TCP_HTTP_INCOMING) {
htc->parent->onHttpRequestToServer(htc); tc->parent->onHttpRequestToServer(tc);
} else { } else {
htc->parent->onHttpResponseFromClient(htc); tc->parent->onHttpResponseFromClient(tc);
} }
return 0; return 0;
} }

7
tcp-proxy/Makefile Normal file
View File

@ -0,0 +1,7 @@
CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)
all:
$(CXX) -O3 -fno-rtti -o tcp-proxy tcp-proxy.cpp
clean:
rm -f *.o tcp-proxy *.dSYM

27
tcp-proxy/tcp-proxy.cpp
View File

@ -48,6 +48,8 @@
using namespace ZeroTier; using namespace ZeroTier;
/* /*
* ZeroTier TCP Proxy Server
*
* This implements a simple packet encapsulation that is designed to look like * This implements a simple packet encapsulation that is designed to look like
* a TLS connection. It's not a TLS connection, but it sends TLS format record * a TLS connection. It's not a TLS connection, but it sends TLS format record
* headers. It could be extended in the future to implement a fake TLS * headers. It could be extended in the future to implement a fake TLS
@ -60,21 +62,26 @@ using namespace ZeroTier;
* <[2] payload length> - 16-bit length of payload in bytes * <[2] payload length> - 16-bit length of payload in bytes
* <[...] payload> - Message payload * <[...] payload> - Message payload
* *
* The primary purpose of TCP sockets is to work over ports like HTTPS(443), * TCP is inherently inefficient for encapsulating Ethernet, since TCP and TCP
* allowing users behind particularly fascist firewalls to at least reach * like protocols over TCP lead to double-ACKs. So this transport is only used
* ZeroTier's supernodes. UDP is the preferred method of communication as * to enable access when UDP or other datagram protocols are not available.
* encapsulating L2 and L3 protocols over TCP is inherently inefficient
* due to double-ACKs. So TCP is only used as a fallback.
* *
* New clients send a HELLO message consisting of a 4-byte message (too small * Clients send a greeting, which is a four-byte message that contains:
* for a ZT packet) containing:
* <[1] ZeroTier major version> * <[1] ZeroTier major version>
* <[1] minor version> * <[1] minor version>
* <[2] revision> * <[2] revision>
* *
* Clients that have send a HELLO and that have a new enough version prepend * If a client has sent a greeting, it uses the new version of this protocol
* each payload with the remote IP the message is destined for. This is in * in which every encapsulated ZT packet is prepended by an IP address where
* the same format as the IP portion of ZeroTier HELLO packets. * it should be forwarded (or where it came from for replies). This causes
* this proxy to act as a remote UDP socket similar to a socks proxy, which
* will allow us to move this function off the supernodes and onto dedicated
* proxy nodes.
*
* Older ZT clients that do not send this message get their packets relayed
* to/from 127.0.0.1:9993, which will allow them to talk to and relay via
* the ZT node on the same machine as the proxy. We'll only support this for
* as long as such nodes appear to be in the wild.
*/ */
struct TcpProxyService; struct TcpProxyService;