diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-09-25 22:13:31 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-09-25 22:13:31 -0700 |
| commit | 027060dad15df2273dcb25616bea5446be335f55 (patch) | |
| tree | 7c1862bd858bcafcb680998da8522a16234dc279 | |
| parent | 077833274798ac4b11e888b99ae62ee3fcf369f4 (diff) | |
| download | infinitytier-027060dad15df2273dcb25616bea5446be335f55.tar.gz infinitytier-027060dad15df2273dcb25616bea5446be335f55.zip | |
Most of new multicast code builds... now on to packet parsing.
| -rw-r--r-- | node/Network.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Network.cpp b/node/Network.cpp index bed50e17..6968fb0d 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -91,7 +91,7 @@ SharedPtr<Network> Network::newInstance(const RuntimeEnvironment *renv,NodeConfi nw->_id = id; nw->_nc = nc; nw->_mac.fromAddress(renv->identity.address(),id); - nw->_r = renv; + nw->RR = renv; nw->_tap = (EthernetTap *)0; nw->_enabled = true; 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)) return; - const RuntimeEnvironment *RR = ((Network *)arg)->_r; + const RuntimeEnvironment *RR = ((Network *)arg)->RR; if (RR->shutdownInProgress) return; |