diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-01 19:09:18 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-01 19:09:18 -0700 |
| commit | 1f28ce398078eff39081ef25e7c1e234dd6f8fc2 (patch) | |
| tree | 993a595474612d930a28a7a3d5b1a6675748db2d /netconf | |
| parent | 49349470a059a54177b0831ea256492d9b30712f (diff) | |
| download | infinitytier-1f28ce398078eff39081ef25e7c1e234dd6f8fc2.tar.gz infinitytier-1f28ce398078eff39081ef25e7c1e234dd6f8fc2.zip | |
Tons more refactoring: simplify Network, move explicit management of Tap out, redo COM serialization, etc.
Diffstat (limited to 'netconf')
| -rw-r--r-- | netconf/SqliteNetworkConfigMaster.cpp | 2 | ||||
| -rw-r--r-- | netconf/SqliteNetworkConfigMaster.hpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/netconf/SqliteNetworkConfigMaster.cpp b/netconf/SqliteNetworkConfigMaster.cpp index 7d8cf3be..d74b0e0f 100644 --- a/netconf/SqliteNetworkConfigMaster.cpp +++ b/netconf/SqliteNetworkConfigMaster.cpp @@ -137,7 +137,7 @@ SqliteNetworkConfigMaster::~SqliteNetworkConfigMaster() } } -NetworkConfigMaster::ResultCode SqliteNetworkConfigMaster::doNetworkConfigRequest(const InetAddress &fromAddr,uint64_t packetId,const Identity &identity,uint64_t nwid,const Dictionary &metaData,uint64_t haveRevision,Dictionary &netconf) +NetworkConfigMaster::ResultCode SqliteNetworkConfigMaster::doNetworkConfigRequest(const InetAddress &fromAddr,const Identity &identity,uint64_t nwid,const Dictionary &metaData,uint64_t haveRevision,Dictionary &netconf) { Mutex::Lock _l(_lock); diff --git a/netconf/SqliteNetworkConfigMaster.hpp b/netconf/SqliteNetworkConfigMaster.hpp index 07388e61..72dea365 100644 --- a/netconf/SqliteNetworkConfigMaster.hpp +++ b/netconf/SqliteNetworkConfigMaster.hpp @@ -54,7 +54,6 @@ public: virtual NetworkConfigMaster::ResultCode doNetworkConfigRequest( const InetAddress &fromAddr, - uint64_t packetId, const Identity &identity, uint64_t nwid, const Dictionary &metaData, |