github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-16 10:03:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

...

Browse source
This commit is contained in:
Adam Ierymenko 2014-10-27 17:32:37 -07:00
parent 295f6a20e0
commit fe7b429866
5 changed files with 61 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

32
testnet/TestEthernetTap.cpp
View file

@ -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();
}
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
}
}
if ((tf.len > 0)&&(_enabled))
_handler(_arg,tf.from,tf.to,tf.etherType,Buffer<4096>(tf.data,tf.len));
_pq_c.wait();
_pq_c.wait(1000);
}
}