ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ONME-4433 SocketAddress::operator== should also check port

pull/12120/head
Marcin Tomczyk 2019-12-16 15:38:49 +01:00
parent f77f4ea911
commit 35e2c9d315
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UNITTESTS/MODULETESTS/features/netsocket/IfaceDnsSocket/test_IfaceDnsSocket.cpp
View File

@ -499,7 +499,7 @@ TEST_F(Test_IfaceDnsSocket, async_cancel)
TEST_F(Test_IfaceDnsSocket, add_server)
{
SocketAddress server_address("1.2.3.4", 8000);
SocketAddress server_address("1.2.3.4", 53);
EXPECT_EQ(NSAPI_ERROR_OK, nsapi_dns_add_server(server_address, NULL));
EXPECT_EQ(NSAPI_ERROR_OK, nsapi_dns_add_server(server_address, NULL)); // Duplicate add - no error.
@ -533,7 +533,7 @@ TEST_F(Test_IfaceDnsSocket, attempts)
SocketAddress known_server_address[DNS_SERVER_SIZE];
for (uint8_t i = DNS_SERVER_SIZE; i > 0; i--) {
uint8_t bytes[NSAPI_IPv4_SIZE] = {i, i, i, i};
known_server_address[i - 1] = SocketAddress(bytes, NSAPI_IPv4);
known_server_address[i - 1] = SocketAddress(bytes, NSAPI_IPv4, 53);
EXPECT_EQ(NSAPI_ERROR_OK, nsapi_dns_add_server(known_server_address[i - 1], NULL));
}
@ -573,7 +573,7 @@ TEST_F(Test_IfaceDnsSocket, retries_attempts)
SocketAddress known_server_address[DNS_SERVER_SIZE];
for (uint8_t i = DNS_SERVER_SIZE; i > 0; i--) {
uint8_t bytes[NSAPI_IPv4_SIZE] = {i, i, i, i};
known_server_address[i - 1] = SocketAddress(bytes, NSAPI_IPv4);
known_server_address[i - 1] = SocketAddress(bytes, NSAPI_IPv4, 53);
EXPECT_EQ(NSAPI_ERROR_OK, nsapi_dns_add_server(known_server_address[i - 1], NULL));
}

2
features/netsocket/SocketAddress.cpp
View File

@ -182,6 +182,8 @@ bool operator==(const SocketAddress &a, const SocketAddress &b)
return true;
} else if (a._addr.version != b._addr.version) {
return false;
} else if (a._port != b._port) {
return false;
} else if (a._addr.version == NSAPI_IPv4) {
return memcmp(a._addr.bytes, b._addr.bytes, NSAPI_IPv4_BYTES) == 0;
} else if (a._addr.version == NSAPI_IPv6) {