diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-04-22 18:14:14 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-04-22 18:14:14 -0700 |
| commit | b33e4af49fb53c7d901e575886feaf6b5c9e7e20 (patch) | |
| tree | 27e9a4150504ec4a4dfddb6e197a738f52c20aa7 /node/MAC.hpp | |
| parent | 0c8051da153b445f756681f9fd7d46bc85d1517f (diff) | |
| parent | 5202fbdaf313096a7205e7bb9c14c11fc628b8f2 (diff) | |
| download | infinitytier-b33e4af49fb53c7d901e575886feaf6b5c9e7e20.tar.gz infinitytier-b33e4af49fb53c7d901e575886feaf6b5c9e7e20.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/MAC.hpp')
| -rw-r--r-- | node/MAC.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/node/MAC.hpp b/node/MAC.hpp index a377ddfd..442a7a2e 100644 --- a/node/MAC.hpp +++ b/node/MAC.hpp @@ -56,6 +56,9 @@ public: ((((uint64_t)e) & 0xffULL) << 8) | (((uint64_t)f) & 0xffULL) ) {} + MAC(const char *s) throw() { fromString(s); } + MAC(const std::string &s) throw() { fromString(s.c_str()); } + MAC(const void *bits,unsigned int len) throw() { setTo(bits,len); } MAC(const Address &ztaddr,uint64_t nwid) throw() { fromAddress(ztaddr,nwid); } |