From 8672ca9cf8b7f065c8e9faa134e5af0683e9f416 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 24 Oct 2014 17:29:09 -0700 Subject: Prep for real tests like alltoall. --- testnet/TestEthernetTap.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'testnet/TestEthernetTap.cpp') 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 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; } -- cgit v1.2.3