diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
| commit | dfdd46db80331104366747e336323095aba2c886 (patch) | |
| tree | 9d7d65a6fcee14f59b9e07dca248a9ae3e180e4e /node/Dictionary.cpp | |
| parent | c59c74dddab862ade65938e630dc0f561fcb0c2f (diff) | |
| parent | 87bb0086deadf3663c3e0ec1308e0d71a6473362 (diff) | |
| download | infinitytier-dfdd46db80331104366747e336323095aba2c886.tar.gz infinitytier-dfdd46db80331104366747e336323095aba2c886.zip | |
Merge branch 'adamierymenko-dev' into android-jni
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 { |