From fe7b429866693debe0057d81f11e527f61dfd24b Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 27 Oct 2014 17:32:37 -0700 Subject: ... --- node/Condition.hpp | 143 ---------------------------------------- testnet.cpp | 58 +++++++++------- testnet/Condition.hpp | 142 +++++++++++++++++++++++++++++++++++++++ testnet/SimNetSocketManager.hpp | 8 +-- testnet/TestEthernetTap.cpp | 32 ++++----- testnet/TestEthernetTap.hpp | 11 ++-- 6 files changed, 199 insertions(+), 195 deletions(-) delete mode 100644 node/Condition.hpp create mode 100644 testnet/Condition.hpp diff --git a/node/Condition.hpp b/node/Condition.hpp deleted file mode 100644 index 74af06a2..00000000 --- a/node/Condition.hpp +++ /dev/null @@ -1,143 +0,0 @@ -/* - * ZeroTier One - Global Peer to Peer Ethernet - * Copyright (C) 2012-2014 ZeroTier Networks 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 . - * - * -- - * - * 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_CONDITION_HPP -#define ZT_CONDITION_HPP - -#include "Constants.hpp" -#include "NonCopyable.hpp" - -#ifdef __WINDOWS__ - -#include -#include - -#include "Utils.hpp" - -namespace ZeroTier { - -class Condition : NonCopyable -{ -public: - Condition() - throw() - { - _sem = CreateSemaphore(NULL,0,1,NULL); - } - - ~Condition() - { - CloseHandle(_sem); - } - - inline void wait() const - throw() - { - WaitForSingleObject(_sem,INFINITE); - } - - inline void wait(unsigned long ms) const - throw() - { - if (ms) - WaitForSingleObject(_sem,(DWORD)ms); - else WaitForSingleObject(_sem,INFINITE); - } - - inline void signal() const - throw() - { - ReleaseSemaphore(_sem,1,NULL); - } - -private: - HANDLE _sem; -}; - -} // namespace ZeroTier - -#else // !__WINDOWS__ - -#include -#include -#include -#include "Utils.hpp" - -namespace ZeroTier { - -class Condition : NonCopyable -{ -public: - Condition() - throw() - { - pthread_mutex_init(&_mh,(const pthread_mutexattr_t *)0); - pthread_cond_init(&_cond,(const pthread_condattr_t *)0); - } - - ~Condition() - { - pthread_cond_destroy(&_cond); - pthread_mutex_destroy(&_mh); - } - - inline void wait() const - throw() - { - pthread_mutex_lock(const_cast (&_mh)); - pthread_cond_wait(const_cast (&_cond),const_cast (&_mh)); - pthread_mutex_unlock(const_cast (&_mh)); - } - - inline void wait(unsigned long ms) const - throw() - { - 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) * 1000000; - pthread_mutex_lock(const_cast (&_mh)); - pthread_cond_timedwait(const_cast (&_cond),const_cast (&_mh),&ts); - pthread_mutex_unlock(const_cast (&_mh)); - } - - inline void signal() const - throw() - { - pthread_cond_signal(const_cast (&_cond)); - } - -private: - pthread_cond_t _cond; - pthread_mutex_t _mh; -}; - -} // namespace ZeroTier - -#endif // !__WINDOWS__ - -#endif 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 &cmd) printf("---------- leave
"ZT_EOL_S); printf("---------- listnetworks
"ZT_EOL_S); printf("---------- listpeers
"ZT_EOL_S); - printf("---------- unicast
[]"ZT_EOL_S); + printf("---------- unicast
[]"ZT_EOL_S); printf("---------- quit"ZT_EOL_S); } @@ -248,7 +248,7 @@ static void doMKSN(const std::vector &cmd) for(std::vector
::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 &cmd) @@ -469,7 +469,7 @@ static void doListPeers(const std::vector &cmd) static void doUnicast(const std::vector &cmd) { union { - uint64_t ts; + uint64_t i[2]; unsigned char data[2800]; } pkt; @@ -484,10 +484,8 @@ static void doUnicast(const std::vector &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 &cmd) for(unsigned int i=0;i::iterator s(senders.begin());s!=senders.end();++s) { for(std::vector
::iterator r(receivers.begin());r!=receivers.end();++r) { if (*s == *r) @@ -523,45 +522,54 @@ static void doUnicast(const std::vector &cmd) SharedPtr 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
receivedFrom; + std::set< std::pair > receivedPairs; + std::vector frames; uint64_t toutend = Utils::now() + tout; do { - std::vector frames; for(std::vector
::iterator r(receivers.begin());r!=receivers.end();++r) { SimNode *receiver = nodes[*r]; SharedPtr rtap(receiver->tapFactory.getByNwid(nwid)); if (rtap) { - rtap->get(frames,true); + rtap->get(frames); for(std::vector::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(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
::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
::iterator s(senders.begin());s!=senders.end();++s) { + for(std::vector
::iterator r(receivers.begin());r!=receivers.end();++r) { + if (*s == *r) + continue; + if (!receivedPairs.count(std::pair(*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
::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
nodes(scanForNewNodes()); for(std::vector
::iterator a(nodes.begin());a!=nodes.end();++a) printf("%s started (normal peer)"ZT_EOL_S,a->toString().c_str()); diff --git a/testnet/Condition.hpp b/testnet/Condition.hpp new file mode 100644 index 00000000..3794ee60 --- /dev/null +++ b/testnet/Condition.hpp @@ -0,0 +1,142 @@ +/* + * ZeroTier One - Global Peer to Peer Ethernet + * Copyright (C) 2012-2014 ZeroTier Networks 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 . + * + * -- + * + * 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_CONDITION_HPP +#define ZT_CONDITION_HPP + +#include "../node/Constants.hpp" +#include "../node/NonCopyable.hpp" + +#ifdef __WINDOWS__ + +#include +#include + +namespace ZeroTier { + +class Condition : NonCopyable +{ +public: + Condition() + throw() + { + _sem = CreateSemaphore(NULL,0,1,NULL); + } + + ~Condition() + { + CloseHandle(_sem); + } + + inline void wait() const + throw() + { + WaitForSingleObject(_sem,INFINITE); + } + + inline void wait(unsigned long ms) const + throw() + { + if (ms) + WaitForSingleObject(_sem,(DWORD)ms); + else WaitForSingleObject(_sem,INFINITE); + } + + inline void signal() const + throw() + { + ReleaseSemaphore(_sem,1,NULL); + } + +private: + HANDLE _sem; +}; + +} // namespace ZeroTier + +#else // !__WINDOWS__ + +#include +#include +#include + +#include "../node/Utils.hpp" + +namespace ZeroTier { + +class Condition : NonCopyable +{ +public: + Condition() + throw() + { + pthread_mutex_init(&_mh,(const pthread_mutexattr_t *)0); + pthread_cond_init(&_cond,(const pthread_condattr_t *)0); + } + + ~Condition() + { + pthread_cond_destroy(&_cond); + pthread_mutex_destroy(&_mh); + } + + inline void wait() const + throw() + { + pthread_mutex_lock(const_cast (&_mh)); + pthread_cond_wait(const_cast (&_cond),const_cast (&_mh)); + pthread_mutex_unlock(const_cast (&_mh)); + } + + inline void wait(unsigned long ms) const + throw() + { + 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) * 1000000; + pthread_mutex_lock(const_cast (&_mh)); + pthread_cond_timedwait(const_cast (&_cond),const_cast (&_mh),&ts); + pthread_mutex_unlock(const_cast (&_mh)); + } + + inline void signal() const + throw() + { + pthread_cond_signal(const_cast (&_cond)); + } + +private: + pthread_cond_t _cond; + pthread_mutex_t _mh; +}; + +} // namespace ZeroTier + +#endif // !__WINDOWS__ + +#endif 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 >(from,Buffer(data,len))); - } + Mutex::Lock _l(_inbox_m); + _inbox.push_back(std::pair< InetAddress,Buffer >(from,Buffer(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 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::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 #include -#include -#include #include #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 &v,bool clearQueue = true) + inline void get(std::vector &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; -- cgit v1.2.3