diff options
Diffstat (limited to 'core/io/ip_address.h')
| -rw-r--r-- | core/io/ip_address.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/core/io/ip_address.h b/core/io/ip_address.h index 257836601a..52d6974d5e 100644 --- a/core/io/ip_address.h +++ b/core/io/ip_address.h @@ -34,7 +34,6 @@ struct IP_Address { private: - union { uint8_t field8[16]; uint16_t field16[8]; @@ -45,31 +44,31 @@ private: bool wildcard; protected: - void _parse_ipv6(const String& p_string); - void _parse_ipv4(const String& p_string, int p_start, uint8_t* p_ret); + void _parse_ipv6(const String &p_string); + void _parse_ipv4(const String &p_string, int p_start, uint8_t *p_ret); public: //operator Variant() const; - bool operator==(const IP_Address& p_ip) const { + bool operator==(const IP_Address &p_ip) const { if (p_ip.valid != valid) return false; if (!valid) return false; - for (int i=0; i<4; i++) + for (int i = 0; i < 4; i++) if (field32[i] != p_ip.field32[i]) return false; return true; } - bool operator!=(const IP_Address& p_ip) const { + bool operator!=(const IP_Address &p_ip) const { if (p_ip.valid != valid) return true; if (!valid) return true; - for (int i=0; i<4; i++) + for (int i = 0; i < 4; i++) if (field32[i] != p_ip.field32[i]) return true; return false; } void clear(); - bool is_wildcard() const {return wildcard;} - bool is_valid() const {return valid;} + bool is_wildcard() const { return wildcard; } + bool is_valid() const { return valid; } bool is_ipv4() const; const uint8_t *get_ipv4() const; void set_ipv4(const uint8_t *p_ip); @@ -78,11 +77,9 @@ public: void set_ipv6(const uint8_t *buf); operator String() const; - IP_Address(const String& p_string); - IP_Address(uint32_t p_a,uint32_t p_b,uint32_t p_c,uint32_t p_d, bool is_v6=false); + IP_Address(const String &p_string); + IP_Address(uint32_t p_a, uint32_t p_b, uint32_t p_c, uint32_t p_d, bool is_v6 = false); IP_Address() { clear(); } }; - - #endif // IP_ADDRESS_H |