123
Diff: IpAddress.cpp
- Revision:
- 11:647d53d146f1
- Parent:
- 10:e4ddab81e6a8
--- a/IpAddress.cpp Tue Aug 27 22:08:54 2019 +0000 +++ b/IpAddress.cpp Fri Aug 30 08:11:40 2019 +0000 @@ -18,7 +18,6 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #include <stdio.h> #include "mbed.h" #include "IpAddress.h" @@ -29,7 +28,8 @@ * @param * @retval */ -IpAddress::IpAddress(void) { +IpAddress::IpAddress(void) +{ memset(_address, 0, sizeof(_address)); } @@ -39,7 +39,8 @@ * @param * @retval */ -IpAddress::IpAddress(uint8_t octet1, uint8_t octet2, uint8_t octet3, uint8_t octet4) { +IpAddress::IpAddress(uint8_t octet1, uint8_t octet2, uint8_t octet3, uint8_t octet4) +{ _address[0] = octet1; _address[1] = octet2; _address[2] = octet3; @@ -52,7 +53,8 @@ * @param * @retval */ -IpAddress::IpAddress(uint32_t address) { +IpAddress::IpAddress(uint32_t address) +{ memcpy(_address, &address, sizeof(_address)); } @@ -62,7 +64,8 @@ * @param * @retval */ -IpAddress::IpAddress(const uint8_t address[4]) { +IpAddress::IpAddress(const uint8_t address[4]) +{ memcpy(_address, address, sizeof(_address)); } @@ -72,10 +75,37 @@ * @param * @retval */ -//IPAddress &IPAddress::operator=(const uint8_t* address) { -// memcpy(_address, address, sizeof(_address)); -// return *this; -//} +IpAddress::IpAddress(const char* str, size_t len) +{ + uint8_t pos = 0; + uint8_t byte; + uint8_t i = 0; + + if (len > 16) + return; + + while (true) { + if (pos == len || str[pos] < '0' || str[pos] > '9') { + return; + } + + byte = 0; + while (pos < len && str[pos] >= '0' && str[pos] <= '9') { + byte *= 10; + byte += str[pos++] - '0'; + } + + _address[i++] = byte; + + if (i == 4) { + return; + } + + if (pos == len || str[pos++] != '.') { + return; + } + } +} /** * @brief @@ -83,7 +113,19 @@ * @param * @retval */ -IpAddress &IpAddress::operator=(uint32_t address) { +IpAddress &IpAddress::operator=(const uint8_t* address) { + memcpy(_address, address, sizeof(_address)); + return *this; +} + +/** + * @brief + * @note + * @param + * @retval + */ +IpAddress &IpAddress::operator=(uint32_t address) +{ memcpy(_address, (const uint8_t*) &address, sizeof(_address)); return *this; } @@ -105,9 +147,10 @@ * @param * @retval */ -const char* IpAddress::toString(char* buf) { - uint8_t i = 0; - uint8_t j = 0; +const char* IpAddress::toString(char* buf) +{ + uint8_t i = 0; + uint8_t j = 0; for (i = 0; i < 3; i++) { j += sprintf(&buf[j], "%d", _address[i]);