diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-03-09 07:50:38 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-03-09 07:50:38 -0800 |
| commit | 0945d6ec0d7b94ba76b5f9490540d35212d21763 (patch) | |
| tree | 46b8937f430b51c6c7e24c8b871c9a4769d7267f /controller/DB.hpp | |
| parent | 77930607230eccdcb7011f6c70465bab3c32cc38 (diff) | |
| parent | 78d9cee4168ddccbdf6d6ea0eed05daa0dac92a4 (diff) | |
| download | infinitytier-0945d6ec0d7b94ba76b5f9490540d35212d21763.tar.gz infinitytier-0945d6ec0d7b94ba76b5f9490540d35212d21763.zip | |
Merge branch 'dev' into edge
Diffstat (limited to 'controller/DB.hpp')
| -rw-r--r-- | controller/DB.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/controller/DB.hpp b/controller/DB.hpp index abd1483e..4757bb40 100644 --- a/controller/DB.hpp +++ b/controller/DB.hpp @@ -1,6 +1,6 @@ /* * ZeroTier One - Network Virtualization Everywhere - * Copyright (C) 2011-2015 ZeroTier, Inc. + * Copyright (C) 2011-2018 ZeroTier, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -119,8 +119,8 @@ protected: std::mutex lock; }; - void _memberChanged(nlohmann::json &old,nlohmann::json &member,bool push); - void _networkChanged(nlohmann::json &old,nlohmann::json &network,bool push); + void _memberChanged(nlohmann::json &old,nlohmann::json &memberConfig,bool push); + void _networkChanged(nlohmann::json &old,nlohmann::json &networkConfig,bool push); void _fillSummaryInfo(const std::shared_ptr<_Network> &nw,NetworkSummaryInfo &info); EmbeddedNetworkController *const _controller; |