diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-16 13:50:29 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-16 13:50:29 -0700 |
| commit | 1d0654bd14890cfe09512a708d7628c475fc5fd7 (patch) | |
| tree | d8802d4f96a0a1a4d2041134d1cd4783f794f632 /node/Dictionary.cpp | |
| parent | 463442eb6f2b4d29406bbf727e8a4f11596a1eac (diff) | |
| parent | a425bbc67301bf486fe5b0aba8adb59ae791403e (diff) | |
| download | infinitytier-1d0654bd14890cfe09512a708d7628c475fc5fd7.tar.gz infinitytier-1d0654bd14890cfe09512a708d7628c475fc5fd7.zip | |
Merge pull request #182 from keesbos/rootserver
Renamed supernode to rootserver
Diffstat (limited to 'node/Dictionary.cpp')
| -rw-r--r-- | node/Dictionary.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/node/Dictionary.cpp b/node/Dictionary.cpp index b3b01525..fb49002a 100644 --- a/node/Dictionary.cpp +++ b/node/Dictionary.cpp @@ -32,9 +32,8 @@ namespace ZeroTier { -void Dictionary::fromString(const char *s,unsigned int maxlen) +void Dictionary::updateFromString(const char *s,unsigned int maxlen) { - clear(); bool escapeState = false; std::string keyBuf; std::string *element = &keyBuf; @@ -75,6 +74,12 @@ void Dictionary::fromString(const char *s,unsigned int maxlen) (*this)[keyBuf]; } +void Dictionary::fromString(const char *s,unsigned int maxlen) +{ + clear(); + updateFromString(s,maxlen); +} + bool Dictionary::sign(const Identity &id,uint64_t now) { try { |