diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-02 16:31:13 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-02 16:31:13 -0700 |
| commit | bf4cab5f2f4c9109d8c33c2c0e04456e17ef1f84 (patch) | |
| tree | c49196c1035642339ee68567710bfc18f90ec76e /netcon/NetconEthernetTap.cpp | |
| parent | 1f4c667646eeed9a2efa8a7df6a3b077108fbdcd (diff) | |
| download | infinitytier-bf4cab5f2f4c9109d8c33c2c0e04456e17ef1f84.tar.gz infinitytier-bf4cab5f2f4c9109d8c33c2c0e04456e17ef1f84.zip | |
Netcon build fixes.
Diffstat (limited to 'netcon/NetconEthernetTap.cpp')
| -rw-r--r-- | netcon/NetconEthernetTap.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp index fe1dac83..55168f62 100644 --- a/netcon/NetconEthernetTap.cpp +++ b/netcon/NetconEthernetTap.cpp @@ -44,7 +44,7 @@ NetconEthernetTap::NetconEthernetTap( const char *friendlyName, void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int), void *arg) : - _phy(this,false,true), + _phy(new Phy<NetconEthernetTap *>(this,false,true)), _unixListenSocket((PhySocket *)0), _handler(handler), _arg(arg), @@ -61,7 +61,7 @@ NetconEthernetTap::NetconEthernetTap( Utils::snprintf(sockPath,sizeof(sockPath),"/tmp/.ztnc_%.16llx",(unsigned long long)nwid); _dev = sockPath; - _unixListenSocket = _phy.unixListen(sockPath,(void *)this); + _unixListenSocket = _phy->unixListen(sockPath,(void *)this); if (!_unixListenSocket) throw std::runtime_error(std::string("unable to bind to ")+sockPath); @@ -71,10 +71,11 @@ NetconEthernetTap::NetconEthernetTap( NetconEthernetTap::~NetconEthernetTap() { _run = false; - _phy.whack(); - _phy.whack(); + _phy->whack(); + _phy->whack(); Thread::join(_thread); - _phy.close(_unixListenSocket,false); + _phy->close(_unixListenSocket,false); + delete _phy; } void NetconEthernetTap::setEnabled(bool en) @@ -126,7 +127,7 @@ void NetconEthernetTap::threadMain() // TODO: compute timeout from LWIP stuff - _phy.poll(pollTimeout); + _phy->poll(pollTimeout); } // TODO: cleanup -- destroy LWIP state, kill any clients, unload .so, etc. |