Rename netconf to controller and NetworkConfigMaster to NetworkController for consistency.

This commit is contained in:
Adam Ierymenko 2015-04-15 15:12:09 -07:00
parent 871473255b
commit 6369c264e2
21 changed files with 103 additions and 130 deletions

View file

@ -42,7 +42,7 @@ class CMWC4096;
class Node;
class Multicaster;
class AntiRecursion;
class NetworkConfigMaster;
class NetworkController;
class SelfAwareness;
/**
@ -54,7 +54,7 @@ public:
RuntimeEnvironment(Node *n) :
node(n),
identity(),
netconfMaster((NetworkConfigMaster *)0),
localNetworkController((NetworkController *)0),
prng((CMWC4096 *)0),
sw((Switch *)0),
mc((Multicaster *)0),
@ -72,8 +72,8 @@ public:
std::string publicIdentityStr;
std::string secretIdentityStr;
// This is set externally to an instance of this base class if netconf functionality is enabled
NetworkConfigMaster *netconfMaster;
// This is set externally to an instance of this base class
NetworkController *localNetworkController;
/*
* Order matters a bit here. These are constructed in this order