From b2d048aa0e01a350eaf524cc752ca5fa9a5a1140 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 21 Jun 2016 07:32:58 -0700 Subject: Make Dictionary templatable so it can be used where we want a higher capacity. --- controller/SqliteNetworkController.cpp | 4 ++-- controller/SqliteNetworkController.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'controller') diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp index 62808de0..e68ad143 100644 --- a/controller/SqliteNetworkController.cpp +++ b/controller/SqliteNetworkController.cpp @@ -402,7 +402,7 @@ SqliteNetworkController::~SqliteNetworkController() } } -NetworkController::ResultCode SqliteNetworkController::doNetworkConfigRequest(const InetAddress &fromAddr,const Identity &signingId,const Identity &identity,uint64_t nwid,const Dictionary &metaData,NetworkConfig &nc) +NetworkController::ResultCode SqliteNetworkController::doNetworkConfigRequest(const InetAddress &fromAddr,const Identity &signingId,const Identity &identity,uint64_t nwid,const Dictionary &metaData,NetworkConfig &nc) { Mutex::Lock _l(_lock); return _doNetworkConfigRequest(fromAddr,signingId,identity,nwid,metaData,nc); @@ -1576,7 +1576,7 @@ unsigned int SqliteNetworkController::_doCPGet( return 404; } -NetworkController::ResultCode SqliteNetworkController::_doNetworkConfigRequest(const InetAddress &fromAddr,const Identity &signingId,const Identity &identity,uint64_t nwid,const Dictionary &metaData,NetworkConfig &nc) +NetworkController::ResultCode SqliteNetworkController::_doNetworkConfigRequest(const InetAddress &fromAddr,const Identity &signingId,const Identity &identity,uint64_t nwid,const Dictionary &metaData,NetworkConfig &nc) { // Assumes _lock is locked diff --git a/controller/SqliteNetworkController.hpp b/controller/SqliteNetworkController.hpp index 3bb53bd9..02aeec10 100644 --- a/controller/SqliteNetworkController.hpp +++ b/controller/SqliteNetworkController.hpp @@ -62,7 +62,7 @@ public: const Identity &signingId, const Identity &identity, uint64_t nwid, - const Dictionary &metaData, + const Dictionary &metaData, NetworkConfig &nc); unsigned int handleControlPlaneHttpGET( @@ -113,7 +113,7 @@ private: const Identity &signingId, const Identity &identity, uint64_t nwid, - const Dictionary &metaData, + const Dictionary &metaData, NetworkConfig &nc); static void _circuitTestCallback(ZT_Node *node,ZT_CircuitTest *test,const ZT_CircuitTestReport *report); -- cgit v1.2.3