Commit 16b1aeb

authored

fix(net): Fix IPv4 address construction from ip_addr_t and comparison (#9724) (#9725)

1 parent f1cb6b8 commit 16b1aebCopy full SHA for 16b1aeb

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ IPAddress &IPAddress::operator=(const IPAddress &address) {`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`bool IPAddress::operator==(const IPAddress &addr) const {`
`269`		`- return (addr._type == _type) && (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0);`
	`269`	`+ return (addr._type == _type) && (_type == IPType::IPv4 ? addr._address.dword[IPADDRESS_V4_DWORD_INDEX] == _address.dword[IPADDRESS_V4_DWORD_INDEX] : memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0);`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`bool IPAddress::operator==(const uint8_t *addr) const {`
`@@ -395,6 +395,7 @@ IPAddress &IPAddress::from_ip_addr_t(const ip_addr_t *addr) {`
`395`	`395`	`#endif /* LWIP_IPV6_SCOPES */`
`396`	`396`	`} else {`
`397`	`397`	`_type = IPv4;`
	`398`	`+ memset(_address.bytes, 0, sizeof(_address.bytes));`
`398`	`399`	`_address.dword[IPADDRESS_V4_DWORD_INDEX] = addr->u_addr.ip4.addr;`
`399`	`400`	`}`
`400`	`401`	`return *this;`

Comments

(0)