ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-21 10:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Most of new multicast code builds... now on to packet parsing.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-09-25 22:13:31 -07:00
parent 0778332747
commit 027060dad1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node/Network.cpp
View File

@ -91,7 +91,7 @@ SharedPtr<Network> Network::newInstance(const RuntimeEnvironment *renv,NodeConfi
nw->_id = id; nw->_id = id;
nw->_nc = nc; nw->_nc = nc;
nw->_mac.fromAddress(renv->identity.address(),id); nw->_mac.fromAddress(renv->identity.address(),id);
nw->_r = renv; nw->RR = renv;
nw->_tap = (EthernetTap *)0; nw->_tap = (EthernetTap *)0;
nw->_enabled = true; nw->_enabled = true;
nw->_lastConfigUpdate = 0; nw->_lastConfigUpdate = 0;
@ -318,7 +318,7 @@ void Network::clean()
} }
} }
{ {
_multicastTopology.clean(now,*(RR->topology),(_config) ? _config->multicastLimit() : (unsigned int)ZT_MULTICAST_DEFAULT_LIMIT); _multicaster.clean(RR,now,(_config) ? _config->multicastLimit() : (unsigned int)ZT_MULTICAST_DEFAULT_LIMIT);
} }
} }
@ -343,7 +343,7 @@ void Network::_CBhandleTapData(void *arg,const MAC &from,const MAC &to,unsigned
if ((!((Network *)arg)->_enabled)||(((Network *)arg)->status() != NETWORK_OK)) if ((!((Network *)arg)->_enabled)||(((Network *)arg)->status() != NETWORK_OK))
return; return;
const RuntimeEnvironment *RR = ((Network *)arg)->_r; const RuntimeEnvironment *RR = ((Network *)arg)->RR;
if (RR->shutdownInProgress) if (RR->shutdownInProgress)
return; return;