From 35e2c9d31508283ccd91e4a94c43e5fe2f05b550 Mon Sep 17 00:00:00 2001 From: Marcin Tomczyk Date: Mon, 16 Dec 2019 15:38:49 +0100 Subject: [PATCH] ONME-4433 SocketAddress::operator== should also check port --- .../netsocket/IfaceDnsSocket/test_IfaceDnsSocket.cpp | 6 +++--- features/netsocket/SocketAddress.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/UNITTESTS/MODULETESTS/features/netsocket/IfaceDnsSocket/test_IfaceDnsSocket.cpp b/UNITTESTS/MODULETESTS/features/netsocket/IfaceDnsSocket/test_IfaceDnsSocket.cpp index 1280732e3c7..68a00ca6326 100644 --- a/UNITTESTS/MODULETESTS/features/netsocket/IfaceDnsSocket/test_IfaceDnsSocket.cpp +++ b/UNITTESTS/MODULETESTS/features/netsocket/IfaceDnsSocket/test_IfaceDnsSocket.cpp @@ -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)); } diff --git a/features/netsocket/SocketAddress.cpp b/features/netsocket/SocketAddress.cpp index 0aa5e4ef59b..deb7affe882 100644 --- a/features/netsocket/SocketAddress.cpp +++ b/features/netsocket/SocketAddress.cpp @@ -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) {