ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-26 16:11:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://10.187.63.16/zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Adam Ierymenko 2017-05-10 13:48:55 -07:00
commit 22780a8504
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
node/Buffer.hpp
View File

@ -123,7 +123,7 @@ public:
inline Buffer &operator=(const Buffer<C2> &b) inline Buffer &operator=(const Buffer<C2> &b)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if (b._l > C) if (unlikely(b._l > C))
throw std::out_of_range("Buffer: assignment from buffer larger than capacity"); throw std::out_of_range("Buffer: assignment from buffer larger than capacity");
memcpy(_b,b._b,_l = b._l); memcpy(_b,b._b,_l = b._l);
return *this; return *this;
@ -139,7 +139,7 @@ public:
inline void copyFrom(const void *b,unsigned int l) inline void copyFrom(const void *b,unsigned int l)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if (l > C) if (unlikely(l > C))
throw std::out_of_range("Buffer: set from C array larger than capacity"); throw std::out_of_range("Buffer: set from C array larger than capacity");
_l = l; _l = l;
memcpy(_b,b,l); memcpy(_b,b,l);
@ -148,7 +148,7 @@ public:
unsigned char operator[](const unsigned int i) const unsigned char operator[](const unsigned int i) const
throw(std::out_of_range) throw(std::out_of_range)
{ {
if (i >= _l) if (unlikely(i >= _l))
throw std::out_of_range("Buffer: [] beyond end of data"); throw std::out_of_range("Buffer: [] beyond end of data");
return (unsigned char)_b[i]; return (unsigned char)_b[i];
} }
@ -156,7 +156,7 @@ public:
unsigned char &operator[](const unsigned int i) unsigned char &operator[](const unsigned int i)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if (i >= _l) if (unlikely(i >= _l))
throw std::out_of_range("Buffer: [] beyond end of data"); throw std::out_of_range("Buffer: [] beyond end of data");
return ((unsigned char *)_b)[i]; return ((unsigned char *)_b)[i];
} }
@ -177,14 +177,14 @@ public:
unsigned char *field(unsigned int i,unsigned int l) unsigned char *field(unsigned int i,unsigned int l)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if ((i + l) > _l) if (unlikely((i + l) > _l))
throw std::out_of_range("Buffer: field() beyond end of data"); throw std::out_of_range("Buffer: field() beyond end of data");
return (unsigned char *)(_b + i); return (unsigned char *)(_b + i);
} }
const unsigned char *field(unsigned int i,unsigned int l) const const unsigned char *field(unsigned int i,unsigned int l) const
throw(std::out_of_range) throw(std::out_of_range)
{ {
if ((i + l) > _l) if (unlikely((i + l) > _l))
throw std::out_of_range("Buffer: field() beyond end of data"); throw std::out_of_range("Buffer: field() beyond end of data");
return (const unsigned char *)(_b + i); return (const unsigned char *)(_b + i);
} }
@ -200,7 +200,7 @@ public:
inline void setAt(unsigned int i,const T v) inline void setAt(unsigned int i,const T v)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if ((i + sizeof(T)) > _l) if (unlikely((i + sizeof(T)) > _l))
throw std::out_of_range("Buffer: setAt() beyond end of data"); throw std::out_of_range("Buffer: setAt() beyond end of data");
#ifdef ZT_NO_TYPE_PUNNING #ifdef ZT_NO_TYPE_PUNNING
uint8_t *p = reinterpret_cast<uint8_t *>(_b + i); uint8_t *p = reinterpret_cast<uint8_t *>(_b + i);
@ -223,7 +223,7 @@ public:
inline T at(unsigned int i) const inline T at(unsigned int i) const
throw(std::out_of_range) throw(std::out_of_range)
{ {
if ((i + sizeof(T)) > _l) if (unlikely((i + sizeof(T)) > _l))
throw std::out_of_range("Buffer: at() beyond end of data"); throw std::out_of_range("Buffer: at() beyond end of data");
#ifdef ZT_NO_TYPE_PUNNING #ifdef ZT_NO_TYPE_PUNNING
T v = 0; T v = 0;
@ -250,7 +250,7 @@ public:
inline void append(const T v) inline void append(const T v)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if ((_l + sizeof(T)) > C) if (unlikely((_l + sizeof(T)) > C))
throw std::out_of_range("Buffer: append beyond capacity"); throw std::out_of_range("Buffer: append beyond capacity");
#ifdef ZT_NO_TYPE_PUNNING #ifdef ZT_NO_TYPE_PUNNING
uint8_t *p = reinterpret_cast<uint8_t *>(_b + _l); uint8_t *p = reinterpret_cast<uint8_t *>(_b + _l);
@ -273,7 +273,7 @@ public:
inline void append(unsigned char c,unsigned int n) inline void append(unsigned char c,unsigned int n)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if ((_l + n) > C) if (unlikely((_l + n) > C))
throw std::out_of_range("Buffer: append beyond capacity"); throw std::out_of_range("Buffer: append beyond capacity");
for(unsigned int i=0;i<n;++i) for(unsigned int i=0;i<n;++i)
_b[_l++] = (char)c; _b[_l++] = (char)c;
@ -289,7 +289,7 @@ public:
inline void append(const void *b,unsigned int l) inline void append(const void *b,unsigned int l)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if ((_l + l) > C) if (unlikely((_l + l) > C))
throw std::out_of_range("Buffer: append beyond capacity"); throw std::out_of_range("Buffer: append beyond capacity");
memcpy(_b + _l,b,l); memcpy(_b + _l,b,l);
_l += l; _l += l;
@ -317,7 +317,7 @@ public:
throw(std::out_of_range) throw(std::out_of_range)
{ {
for(;;) { for(;;) {
if (_l >= C) if (unlikely(_l >= C))
throw std::out_of_range("Buffer: append beyond capacity"); throw std::out_of_range("Buffer: append beyond capacity");
if (!(_b[_l++] = *(s++))) if (!(_b[_l++] = *(s++)))
break; break;
@ -351,7 +351,7 @@ public:
inline char *appendField(unsigned int l) inline char *appendField(unsigned int l)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if ((_l + l) > C) if (unlikely((_l + l) > C))
throw std::out_of_range("Buffer: append beyond capacity"); throw std::out_of_range("Buffer: append beyond capacity");
char *r = _b + _l; char *r = _b + _l;
_l += l; _l += l;
@ -369,7 +369,7 @@ public:
inline void addSize(unsigned int i) inline void addSize(unsigned int i)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if ((i + _l) > C) if (unlikely((i + _l) > C))
throw std::out_of_range("Buffer: setSize to larger than capacity"); throw std::out_of_range("Buffer: setSize to larger than capacity");
_l += i; _l += i;
} }
@ -385,7 +385,7 @@ public:
inline void setSize(const unsigned int i) inline void setSize(const unsigned int i)
throw(std::out_of_range) throw(std::out_of_range)
{ {
if (i > C) if (unlikely(i > C))
throw std::out_of_range("Buffer: setSize to larger than capacity"); throw std::out_of_range("Buffer: setSize to larger than capacity");
_l = i; _l = i;
} }
@ -401,7 +401,7 @@ public:
{ {
if (!at) if (!at)
return; return;
if (at > _l) if (unlikely(at > _l))
throw std::out_of_range("Buffer: behead() beyond capacity"); throw std::out_of_range("Buffer: behead() beyond capacity");
::memmove(_b,_b + at,_l -= at); ::memmove(_b,_b + at,_l -= at);
} }
@ -417,7 +417,7 @@ public:
throw(std::out_of_range) throw(std::out_of_range)
{ {
const unsigned int endr = at + length; const unsigned int endr = at + length;
if (endr > _l) if (unlikely(endr > _l))
throw std::out_of_range("Buffer: erase() range beyond end of buffer"); throw std::out_of_range("Buffer: erase() range beyond end of buffer");
::memmove(_b + at,_b + endr,_l - endr); ::memmove(_b + at,_b + endr,_l - endr);
_l -= length; _l -= length;