diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-01-05 17:47:59 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-01-05 17:47:59 -0800 |
| commit | 4e95384ad60c853f01c50e233b8cb48f239f033f (patch) | |
| tree | 1dccba67dffcc031462d64806fc8abbeb9989fc0 /node/Network.hpp | |
| parent | 08ba2ff752e78571b54c0500e8ee53f721500048 (diff) | |
| download | infinitytier-4e95384ad60c853f01c50e233b8cb48f239f033f.tar.gz infinitytier-4e95384ad60c853f01c50e233b8cb48f239f033f.zip | |
Cleanup, add tristate to config code in Network, and happy new year!
Diffstat (limited to 'node/Network.hpp')
| -rw-r--r-- | node/Network.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Network.hpp b/node/Network.hpp index 169dc3fc..a841dbda 100644 --- a/node/Network.hpp +++ b/node/Network.hpp @@ -1,6 +1,6 @@ /* * ZeroTier One - Global Peer to Peer Ethernet - * Copyright (C) 2011-2014 ZeroTier Networks LLC + * Copyright (C) 2011-2015 ZeroTier Networks * * 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 @@ -189,9 +189,9 @@ public: * * @param conf Configuration in key/value dictionary form * @param saveToDisk IF true (default), write config to disk - * @return True if configuration was accepted + * @return 0 -- rejected, 1 -- accepted but not new, 2 -- accepted new config */ - bool setConfiguration(const Dictionary &conf,bool saveToDisk = true); + int setConfiguration(const Dictionary &conf,bool saveToDisk = true); /** * Set netconf failure to 'access denied' -- called in IncomingPacket when netconf master reports this |