arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Migrate from astyle to clang-format (#8464)

Browse Source
This commit is contained in:
Maxim Prokhorov
2022-02-20 19:23:33 +03:00
committed by Max Prokhorov
parent 46190b61f1
commit 19b7a29720
241 changed files with 15925 additions and 16197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
libraries/Netdump/src/NetdumpIP.cpp
View File

@ -24,11 +24,10 @@
namespace NetCapture
{
NetdumpIP::NetdumpIP()
{
}
NetdumpIP::NetdumpIP() { }
NetdumpIP::NetdumpIP(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
NetdumpIP::NetdumpIP(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet,
uint8_t fourth_octet)
{
setV4();
(*this)[0] = first_octet;
@ -37,7 +36,7 @@ NetdumpIP::NetdumpIP(uint8_t first_octet, uint8_t second_octet, uint8_t third_oc
(*this)[3] = fourth_octet;
}
NetdumpIP::NetdumpIP(const uint8_t *address, bool v4)
NetdumpIP::NetdumpIP(const uint8_t* address, bool v4)
{
uint8_t cnt;
if (v4)
@ -88,7 +87,7 @@ NetdumpIP::NetdumpIP(const String& ip)
}
}
bool NetdumpIP::fromString(const char *address)
bool NetdumpIP::fromString(const char* address)
{
if (!fromString4(address))
{
@ -97,12 +96,12 @@ bool NetdumpIP::fromString(const char *address)
return true;
}
bool NetdumpIP::fromString4(const char *address)
bool NetdumpIP::fromString4(const char* address)
{
// TODO: (IPv4) add support for "a", "a.b", "a.b.c" formats
uint16_t acc = 0; // Accumulator
uint8_t dots = 0;
uint16_t acc = 0; // Accumulator
uint8_t dots = 0;
while (*address)
{
@ -124,7 +123,7 @@ bool NetdumpIP::fromString4(const char *address)
return false;
}
(*this)[dots++] = acc;
acc = 0;
acc = 0;
}
else
{
@ -144,12 +143,12 @@ bool NetdumpIP::fromString4(const char *address)
return true;
}
bool NetdumpIP::fromString6(const char *address)
bool NetdumpIP::fromString6(const char* address)
{
// TODO: test test test
uint32_t acc = 0; // Accumulator
int dots = 0, doubledots = -1;
uint32_t acc = 0; // Accumulator
int dots = 0, doubledots = -1;
while (*address)
{
@ -162,7 +161,7 @@ bool NetdumpIP::fromString6(const char *address)
}
acc = acc * 16 + (c - '0');
if (acc > 0xffff)
// Value out of range
// Value out of range
{
return false;
}
@ -172,7 +171,7 @@ bool NetdumpIP::fromString6(const char *address)
if (*address == ':')
{
if (doubledots >= 0)
// :: allowed once
// :: allowed once
{
return false;
}
@ -181,22 +180,22 @@ bool NetdumpIP::fromString6(const char *address)
address++;
}
if (dots == 7)
// too many separators
// too many separators
{
return false;
}
reinterpret_cast<uint16_t*>(rawip)[dots++] = PP_HTONS(acc);
acc = 0;
acc = 0;
}
else
// Invalid char
// Invalid char
{
return false;
}
}
if (doubledots == -1 && dots != 7)
// Too few separators
// Too few separators
{
return false;
}
@ -206,7 +205,8 @@ bool NetdumpIP::fromString6(const char *address)
{
for (int i = dots - doubledots - 1; i >= 0; i--)
{
reinterpret_cast<uint16_t*>(rawip)[8 - dots + doubledots + i] = reinterpret_cast<uint16_t*>(rawip)[doubledots + i];
reinterpret_cast<uint16_t*>(rawip)[8 - dots + doubledots + i]
= reinterpret_cast<uint16_t*>(rawip)[doubledots + i];
}
for (int i = doubledots; i < 8 - dots + doubledots; i++)
{
@ -223,12 +223,11 @@ String NetdumpIP::toString()
StreamString sstr;
if (isV6())
{
sstr.reserve(40); // 8 shorts x 4 chars each + 7 colons + nullterm
sstr.reserve(40); // 8 shorts x 4 chars each + 7 colons + nullterm
}
else
{
sstr.reserve(16); // 4 bytes with 3 chars max + 3 dots + nullterm, or '(IP unset)'
sstr.reserve(16); // 4 bytes with 3 chars max + 3 dots + nullterm, or '(IP unset)'
}
printTo(sstr);
return sstr;
@ -253,7 +252,7 @@ size_t NetdumpIP::printTo(Print& p)
{
n += p.printf_P(PSTR("%x"), bit);
if (count0 > 0)
// no more hiding 0
// no more hiding 0
{
count0 = -8;
}
@ -280,7 +279,7 @@ size_t NetdumpIP::printTo(Print& p)
return n;
}
bool NetdumpIP::compareRaw(IPversion v, const uint8_t* a, const uint8_t* b) const
bool NetdumpIP::compareRaw(IPversion v, const uint8_t* a, const uint8_t* b) const
{
for (int i = 0; i < (v == IPversion::IPV4 ? 4 : 16); i++)
{
@ -296,7 +295,7 @@ bool NetdumpIP::compareIP(const IPAddress& ip) const
{
switch (ipv)
{
case IPversion::UNSET :
case IPversion::UNSET:
if (ip.isSet())
{
return false;
@ -306,7 +305,7 @@ bool NetdumpIP::compareIP(const IPAddress& ip) const
return true;
}
break;
case IPversion::IPV4 :
case IPversion::IPV4:
if (ip.isV6() || !ip.isSet())
{
return false;
@ -316,7 +315,7 @@ bool NetdumpIP::compareIP(const IPAddress& ip) const
return compareRaw(IPversion::IPV4, rawip, reinterpret_cast<const uint8_t*>(&ip.v4()));
}
break;
case IPversion::IPV6 :
case IPversion::IPV6:
if (ip.isV4() || !ip.isSet())
{
return false;
@ -326,7 +325,7 @@ bool NetdumpIP::compareIP(const IPAddress& ip) const
return compareRaw(IPversion::IPV6, rawip, reinterpret_cast<const uint8_t*>(ip.raw6()));
}
break;
default :
default:
return false;
break;
}
@ -336,7 +335,7 @@ bool NetdumpIP::compareIP(const NetdumpIP& nip) const
{
switch (ipv)
{
case IPversion::UNSET :
case IPversion::UNSET:
if (nip.isSet())
{
return false;
@ -346,7 +345,7 @@ bool NetdumpIP::compareIP(const NetdumpIP& nip) const
return true;
}
break;
case IPversion::IPV4 :
case IPversion::IPV4:
if (nip.isV6() || !nip.isSet())
{
return false;
@ -356,7 +355,7 @@ bool NetdumpIP::compareIP(const NetdumpIP& nip) const
return compareRaw(IPversion::IPV4, rawip, nip.rawip);
}
break;
case IPversion::IPV6 :
case IPversion::IPV6:
if (nip.isV4() || !nip.isSet())
{
return false;
@ -366,10 +365,10 @@ bool NetdumpIP::compareIP(const NetdumpIP& nip) const
return compareRaw(IPversion::IPV6, rawip, nip.rawip);
}
break;
default :
default:
return false;
break;
}
}
} // namespace NetCapture
} // namespace NetCapture