Browse Source

Merge pull request #664 from brain5lug/tag-cleanup

Tag class clean-up
pull/666/head
orignal 8 years ago committed by GitHub
parent
commit
b54892a783
  1. 59
      Tag.h

59
Tag.h

@ -1,3 +1,6 @@
#ifndef TAG_H__
#define TAG_H__
/* /*
* Copyright (c) 2013-2016, The PurpleI2P Project * Copyright (c) 2013-2016, The PurpleI2P Project
* *
@ -6,53 +9,42 @@
* See full license text in LICENSE file at top of project tree * See full license text in LICENSE file at top of project tree
*/ */
#ifndef TAG_H__ #include <boost/static_assert.hpp>
#define TAG_H__ #include <string.h>
#include <string.h> /* memcpy */
#include "Base.h" #include "Base.h"
namespace i2p { namespace i2p {
namespace data { namespace data {
template<int sz>
template<size_t sz>
class Tag class Tag
{ {
BOOST_STATIC_ASSERT_MSG(sz % 8 == 0, "Tag size must be multiple of 8 bytes");
public: public:
Tag (const uint8_t * buf) { memcpy (m_Buf, buf, sz); };
Tag (const Tag<sz>& ) = default;
#ifndef _WIN32 // FIXME!!! msvs 2013 can't compile it
Tag (Tag<sz>&& ) = default;
#endif
Tag () = default; Tag () = default;
Tag (const uint8_t * buf) { memcpy (m_Buf, buf, sz); }
Tag<sz>& operator= (const Tag<sz>& ) = default; bool operator== (const Tag& other) const { return !memcmp (m_Buf, other.m_Buf, sz); }
#ifndef _WIN32 bool operator< (const Tag& other) const { return memcmp (m_Buf, other.m_Buf, sz) < 0; }
Tag<sz>& operator= (Tag<sz>&& ) = default;
#endif
uint8_t * operator()() { return m_Buf; }; uint8_t * operator()() { return m_Buf; }
const uint8_t * operator()() const { return m_Buf; }; const uint8_t * operator()() const { return m_Buf; }
operator uint8_t * () { return m_Buf; }; operator uint8_t * () { return m_Buf; }
operator const uint8_t * () const { return m_Buf; }; operator const uint8_t * () const { return m_Buf; }
const uint64_t * GetLL () const { return ll; }; const uint8_t * data() const { return m_Buf; }
const uint64_t * GetLL () const { return ll; }
bool operator== (const Tag<sz>& other) const { return !memcmp (m_Buf, other.m_Buf, sz); };
bool operator< (const Tag<sz>& other) const { return memcmp (m_Buf, other.m_Buf, sz) < 0; };
bool IsZero () const bool IsZero () const
{ {
for (int i = 0; i < sz/8; i++) for (size_t i = 0; i < sz/8; ++i)
if (ll[i]) return false; if (ll[i]) return false;
return true; return true;
} }
const uint8_t * data() const { return m_Buf; }
/** fill with a value */
void Fill(uint8_t c) void Fill(uint8_t c)
{ {
memset(m_Buf, c, sz); memset(m_Buf, c, sz);
@ -61,17 +53,15 @@ namespace data {
std::string ToBase64 () const std::string ToBase64 () const
{ {
char str[sz*2]; char str[sz*2];
int l = i2p::data::ByteStreamToBase64 (m_Buf, sz, str, sz*2); size_t l = i2p::data::ByteStreamToBase64 (m_Buf, sz, str, sz*2);
str[l] = 0; return std::string (str, str + l);
return std::string (str);
} }
std::string ToBase32 () const std::string ToBase32 () const
{ {
char str[sz*2]; char str[sz*2];
int l = i2p::data::ByteStreamToBase32 (m_Buf, sz, str, sz*2); size_t l = i2p::data::ByteStreamToBase32 (m_Buf, sz, str, sz*2);
str[l] = 0; return std::string (str, str + l);
return std::string (str);
} }
void FromBase32 (const std::string& s) void FromBase32 (const std::string& s)
@ -86,12 +76,13 @@ namespace data {
private: private:
union // 8 bytes alignment union // 8 bytes aligned
{ {
uint8_t m_Buf[sz]; uint8_t m_Buf[sz];
uint64_t ll[sz/8]; uint64_t ll[sz/8];
}; };
}; };
} // data } // data
} // i2p } // i2p

Loading…
Cancel
Save