Merge branch 'netcon' of http://10.6.6.2/zerotier/zerotierone into netcon

This commit is contained in:
Joseph Henry 2015-09-24 14:33:49 -04:00
commit 0027a1e152
2 changed files with 19 additions and 6 deletions

View file

@ -96,6 +96,7 @@ NetconEthernetTap::~NetconEthernetTap()
_phy.whack();
Thread::join(_thread);
_phy.close(_unixListenSocket,false);
delete lwipstack;
}
void NetconEthernetTap::setEnabled(bool en)