...

5 files changed, 61 insertions, 57 deletions

diff --git a/testnet.cpp b/testnet.cpp
index d68b63ce..cab3248e 100644
--- a/testnet.cpp
+++ b/testnet.cpp
@@ -223,7 +223,7 @@ static void doHelp(const std::vector<std::string> &cmd)
 	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: 8> [<timeout, default: 2>]"ZT_EOL_S);
+	printf("---------- unicast <address/*/**> <address/*/**> <network ID> <frame length, min: 16> [<timeout, default: 2>]"ZT_EOL_S);
 	printf("---------- quit"ZT_EOL_S);
 }
 
@@ -248,7 +248,7 @@ static void doMKSN(const std::vector<std::string> &cmd)
 	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());
+	//printf("---------- root topology is: %s"ZT_EOL_S,rootTopology.c_str());
 }
 
 static void doMKN(const std::vector<std::string> &cmd)
@@ -469,7 +469,7 @@ static void doListPeers(const std::vector<std::string> &cmd)
 static void doUnicast(const std::vector<std::string> &cmd)
 {
 	union {
-		uint64_t ts;
+		uint64_t i[2];
 		unsigned char data[2800];
 	} pkt;
 
@@ -484,10 +484,8 @@ static void doUnicast(const std::vector<std::string> &cmd)
 	if (cmd.size() >= 6)
 		tout = Utils::strToU64(cmd[5].c_str()) * 1000ULL;
 
-	if (frameLen < 8) {
-		doHelp(cmd);
-		return;
-	}
+	if (frameLen < 16)
+		frameLen = 16;
 	if (frameLen > 2800)
 		frameLen = 2800;
 
@@ -512,6 +510,7 @@ static void doUnicast(const std::vector<std::string> &cmd)
 	for(unsigned int i=0;i<frameLen;++i)
 		pkt.data[i] = (unsigned char)prng.next32();
 
+	unsigned long sentCount = 0;
 	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)
@@ -523,45 +522,54 @@ static void doUnicast(const std::vector<std::string> &cmd)
 			SharedPtr<TestEthernetTap> rtap(receiver->tapFactory.getByNwid(nwid));
 
 			if ((stap)&&(rtap)) {
-				pkt.ts = Utils::now();
+				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(),nwid,frameLen);
-			} else if (stap)
+				++sentCount;
+			} else if (stap) {
 				printf("%s -> !%s (receiver not a member of %.16llx)"ZT_EOL_S,s->toString().c_str(),r->toString().c_str(),nwid);
-			else if (rtap) 
+			} else if (rtap) {
 				printf("%s -> !%s (sender not a member of %.16llx)"ZT_EOL_S,s->toString().c_str(),r->toString().c_str(),nwid);
-			else printf("%s -> !%s (neither party is a member of %.16llx)"ZT_EOL_S,s->toString().c_str(),r->toString().c_str(),nwid);
+			} else {
+				printf("%s -> !%s (neither party is a member of %.16llx)"ZT_EOL_S,s->toString().c_str(),r->toString().c_str(),nwid);
+			}
 		}
 	}
 
 	printf("---------- waiting up to %llu seconds..."ZT_EOL_S,tout / 1000ULL);
 
-	std::set<Address> receivedFrom;
+	std::set< std::pair<Address,Address> > receivedPairs;
+	std::vector<TestEthernetTap::TestFrame> frames;
 	uint64_t toutend = Utils::now() + tout;
 	do {
-		std::vector<TestEthernetTap::TestFrame> frames;
 		for(std::vector<Address>::iterator r(receivers.begin());r!=receivers.end();++r) {
 			SimNode *receiver = nodes[*r];
 			SharedPtr<TestEthernetTap> rtap(receiver->tapFactory.getByNwid(nwid));
 			if (rtap) {
-				rtap->get(frames,true);
+				rtap->get(frames);
 				for(std::vector<TestEthernetTap::TestFrame>::iterator f(frames.begin());f!=frames.end();++f) {
-					if ((f->len == frameLen)&&(!memcmp(f->data + 8,pkt.data + 8,frameLen - 8))) {
-						receivedFrom.insert(*r);
-						uint64_t ints = 0;
-						memcpy(&ints,f->data,8);
-						printf("%s received test packet, latency == %llums"ZT_EOL_S,r->toString().c_str(),f->timestamp - ints);
+					if ((f->len == frameLen)&&(!memcmp(f->data + 16,pkt.data + 16,frameLen - 16))) {
+						uint64_t ints[2];
+						memcpy(ints,f->data,16);
+						printf("%s <- %.10llx received test packet, latency == %llums"ZT_EOL_S,r->toString().c_str(),ints[0],f->timestamp - ints[1]);
+						receivedPairs.insert(std::pair<Address,Address>(Address(ints[0]),*r));
 					} else {
-						printf("%s received spurious packet, length == %u, etherType == %.4x"ZT_EOL_S,r->toString().c_str(),f->len,f->etherType);
+						printf("%s !! got spurious packet, length == %u, etherType == %.4x"ZT_EOL_S,r->toString().c_str(),f->len,f->etherType);
 					}
 				}
 			}
 		}
-	} while ((receivedFrom.size() < receivers.size())&&(Utils::now() < toutend));
+		Thread::sleep(250);
+	} while ((receivedPairs.size() < sentCount)&&(Utils::now() < toutend));
 
-	for(std::vector<Address>::iterator r(receivers.begin());r!=receivers.end();++r) {
-		if (!receivedFrom.count(*r)) {
-			printf("%s did not receive test packet: timed out"ZT_EOL_S,r->toString().c_str());
+	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 (!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());
+			}
 		}
 	}
 }
@@ -593,7 +601,7 @@ int main(int argc,char **argv)
 		} 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());
+			//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());
diff --git a/node/Condition.hpp b/testnet/Condition.hpp
index 74af06a2..3794ee60 100644
--- a/node/Condition.hpp
+++ b/testnet/Condition.hpp
@@ -28,16 +28,14 @@
 #ifndef ZT_CONDITION_HPP
 #define ZT_CONDITION_HPP
 
-#include "Constants.hpp"
-#include "NonCopyable.hpp"
+#include "../node/Constants.hpp"
+#include "../node/NonCopyable.hpp"
 
 #ifdef __WINDOWS__
 
 #include <Windows.h>
 #include <stdlib.h>
 
-#include "Utils.hpp"
-
 namespace ZeroTier {
 
 class Condition : NonCopyable
@@ -85,7 +83,8 @@ private:
 #include <time.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include "Utils.hpp"
+
+#include "../node/Utils.hpp"
 
 namespace ZeroTier {
 
diff --git a/testnet/SimNetSocketManager.hpp b/testnet/SimNetSocketManager.hpp
index 82092b78..1dde7fe8 100644
--- a/testnet/SimNetSocketManager.hpp
+++ b/testnet/SimNetSocketManager.hpp
@@ -35,7 +35,7 @@
 #include "../node/Constants.hpp"
 #include "../node/SocketManager.hpp"
 #include "../node/Mutex.hpp"
-#include "../node/Condition.hpp"
+#include "Condition.hpp"
 
 namespace ZeroTier {
 
@@ -96,10 +96,8 @@ public:
 	 */
 	inline void enqueue(const InetAddress &from,const void *data,unsigned int len)
 	{
-		{
-			Mutex::Lock _l(_inbox_m);
-			_inbox.push_back(std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> >(from,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN>(data,len)));
-		}
+		Mutex::Lock _l(_inbox_m);
+		_inbox.push_back(std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> >(from,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN>(data,len)));
 		_waitCond.signal();
 	}
 
diff --git a/testnet/TestEthernetTap.cpp b/testnet/TestEthernetTap.cpp
index fd594a21..3d29d6e2 100644
--- a/testnet/TestEthernetTap.cpp
+++ b/testnet/TestEthernetTap.cpp
@@ -80,9 +80,9 @@ TestEthernetTap::~TestEthernetTap()
 	static const TestFrame zf;
 	{
 		Mutex::Lock _l(_pq_m);
-		_pq.push(zf); // 0 length frame = exit
+		_pq.push_back(zf); // 0 length frame = exit
+		_pq_c.signal();
 	}
-	_pq_c.signal();
 	Thread::join(_thread);
 }
 
@@ -138,9 +138,9 @@ bool TestEthernetTap::injectPacketFromHost(const MAC &from,const MAC &to,unsigne
 
 	{
 		Mutex::Lock _l(_pq_m);
-		_pq.push(TestFrame(from,to,data,etherType & 0xffff,len));
+		_pq.push_back(TestFrame(from,to,data,etherType & 0xffff,len));
+		_pq_c.signal();
 	}
-	_pq_c.signal();
 
 	return true;
 }
@@ -148,23 +148,25 @@ bool TestEthernetTap::injectPacketFromHost(const MAC &from,const MAC &to,unsigne
 void TestEthernetTap::threadMain()
 	throw()
 {
-	TestFrame tf;
+	std::vector<TestFrame> q;
 	for(;;) {
-		tf.len = 0;
 		{
 			Mutex::Lock _l(_pq_m);
-			if (!_pq.empty()) {
-				if (_pq.front().len == 0)
-					break;
-				memcpy(&tf,&(_pq.front()),sizeof(tf));
-				_pq.pop();
-			}
+			q = _pq;
+			_pq.clear();
 		}
 
-		if ((tf.len > 0)&&(_enabled))
-			_handler(_arg,tf.from,tf.to,tf.etherType,Buffer<4096>(tf.data,tf.len));
+		for(std::vector<TestFrame>::iterator f(q.begin());f!=q.end();++f) {
+			if (!f->len)
+				return; // empty frame signals thread to die
+			else if (_enabled) {
+				try {
+					_handler(_arg,f->from,f->to,f->etherType,Buffer<4096>(f->data,f->len));
+				} catch ( ... ) {} // handlers should not throw
+			}
+		}
 
-		_pq_c.wait();
+		_pq_c.wait(1000);
 	}
 }
 
diff --git a/testnet/TestEthernetTap.hpp b/testnet/TestEthernetTap.hpp
index b7f79aca..babd35ad 100644
--- a/testnet/TestEthernetTap.hpp
+++ b/testnet/TestEthernetTap.hpp
@@ -32,8 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <stdexcept>
-#include <queue>
 #include <string>
 
 #include "../node/Constants.hpp"
@@ -42,7 +40,7 @@
 #include "../node/SharedPtr.hpp"
 #include "../node/Thread.hpp"
 #include "../node/Mutex.hpp"
-#include "../node/Condition.hpp"
+#include "Condition.hpp"
 
 namespace ZeroTier {
 
@@ -109,12 +107,11 @@ public:
 	inline uint64_t nwid() const { return _nwid; }
 
 	// Get things that have been put() and empty queue
-	inline void get(std::vector<TestFrame> &v,bool clearQueue = true)
+	inline void get(std::vector<TestFrame> &v)
 	{
 		Mutex::Lock _l(_gq_m);
 		v = _gq;
-		if (clearQueue)
-			_gq.clear();
+		_gq.clear();
 	}
 
 	void threadMain()
@@ -130,7 +127,7 @@ private:
 	std::string _dev;
 	volatile bool _enabled;
 
-	std::queue< TestFrame > _pq;
+	std::vector< TestFrame > _pq;
 	Mutex _pq_m;
 	Condition _pq_c;