diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-10-24 17:29:09 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-10-24 17:29:09 -0700 |
| commit | 8672ca9cf8b7f065c8e9faa134e5af0683e9f416 (patch) | |
| tree | 0da537144bb71f6a272ad5bbd1b4685b8410e110 /testnet/TestEthernetTap.cpp | |
| parent | a75a7547b4ea104208e222e521f44471ba7669e5 (diff) | |
| download | infinitytier-8672ca9cf8b7f065c8e9faa134e5af0683e9f416.tar.gz infinitytier-8672ca9cf8b7f065c8e9faa134e5af0683e9f416.zip | |
Prep for real tests like alltoall.
Diffstat (limited to 'testnet/TestEthernetTap.cpp')
| -rw-r--r-- | testnet/TestEthernetTap.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/testnet/TestEthernetTap.cpp b/testnet/TestEthernetTap.cpp index 35c7511b..fd594a21 100644 --- a/testnet/TestEthernetTap.cpp +++ b/testnet/TestEthernetTap.cpp @@ -42,8 +42,6 @@ namespace ZeroTier { -static Mutex printLock; - TestEthernetTap::TestEthernetTap( TestEthernetTapFactory *parent, const MAC &mac, @@ -55,6 +53,7 @@ TestEthernetTap::TestEthernetTap( void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), void *arg) : EthernetTap("TestEthernetTap",mac,mtu,metric), + _nwid(nwid), _parent(parent), _handler(handler), _arg(arg), @@ -114,9 +113,8 @@ std::set<InetAddress> TestEthernetTap::ips() const void TestEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len) { - Mutex::Lock _l(printLock); - fprintf(stdout,"[%s] %s << %s %.4x %s"ZT_EOL_S,_dev.c_str(),to.toString().c_str(),from.toString().c_str(),etherType,std::string((const char *)data,len).c_str()); - fflush(stdout); + Mutex::Lock _l(_gq_m); + _gq.push_back(TestFrame(from,to,data,etherType,len)); } std::string TestEthernetTap::deviceName() const @@ -144,12 +142,6 @@ bool TestEthernetTap::injectPacketFromHost(const MAC &from,const MAC &to,unsigne } _pq_c.signal(); - { - Mutex::Lock _l(printLock); - fprintf(stdout,"[%s] %s >> %s %.4x %s"ZT_EOL_S,_dev.c_str(),from.toString().c_str(),to.toString().c_str(),etherType,std::string((const char *)data,len).c_str()); - fflush(stdout); - } - return true; } |