dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add enabled/disabled status to network.

Browse source
This commit is contained in:
Adam Ierymenko 2014-06-26 17:05:07 -07:00
parent 40bd460b1c
commit 45a1e048bb
2 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
node/Network.cpp
View file

@ -60,6 +60,7 @@ const char *Network::statusString(const Status s)
case NETWORK_ACCESS_DENIED: return "ACCESS_DENIED";
case NETWORK_NOT_FOUND: return "NOT_FOUND";
case NETWORK_INITIALIZATION_FAILED: return "INITIALIZATION_FAILED";
case NETWORK_NO_MORE_DEVICES: return "NO_MORE_DEVICES";
}
return "(invalid)";
}
@ -107,6 +108,7 @@ SharedPtr<Network> Network::newInstance(const RuntimeEnvironment *renv,NodeConfi
nw->_mac.fromAddress(renv->identity.address(),id);
nw->_r = renv;
nw->_tap = (EthernetTap *)0;
nw->_enabled = true;
nw->_lastConfigUpdate = 0;
nw->_destroyOnDelete = false;
nw->_netconfFailure = NETCONF_FAILURE_NONE;
@ -309,7 +311,7 @@ Network::Status Network::status() const
void Network::_CBhandleTapData(void *arg,const MAC &from,const MAC &to,unsigned int etherType,const Buffer<4096> &data)
{
if (((Network *)arg)->status() != NETWORK_OK)
if ((!((Network *)arg)->_enabled)||(((Network *)arg)->status() != NETWORK_OK))
return;
const RuntimeEnvironment *_r = ((Network *)arg)->_r;
@ -417,6 +419,13 @@ void Network::learnBridgeRoute(const MAC &mac,const Address &addr)
}
}
void Network::setEnabled(bool enabled)
{
Mutex::Lock _l(_lock);
_enabled = enabled;
// TODO: bring OS network device to "down" state if enabled == false
}
void Network::_restoreState()
{
if (!_id)