github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-19 21:03:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make Dictionary templatable so it can be used where we want a higher capacity.

Browse source
This commit is contained in:
Adam Ierymenko 2016-06-21 07:32:58 -07:00
commit b2d048aa0e
12 changed files with 67 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
controller/SqliteNetworkController.cpp
View file

@ -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<ZT_NETWORKCONFIG_DICT_CAPACITY> &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<ZT_NETWORKCONFIG_DICT_CAPACITY> &metaData,NetworkConfig &nc)
{
// Assumes _lock is locked

4
controller/SqliteNetworkController.hpp
View file

@ -62,7 +62,7 @@ public:
const Identity &signingId,
const Identity &identity,
uint64_t nwid,
const Dictionary &metaData,
const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &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<ZT_NETWORKCONFIG_DICT_CAPACITY> &metaData,
NetworkConfig &nc);
static void _circuitTestCallback(ZT_Node *node,ZT_CircuitTest *test,const ZT_CircuitTestReport *report);