ARMmbed · 0xc0170 · Nov 28, 2019 · Nov 22, 2019 · Nov 25, 2019 · Nov 26, 2019
diff --git a/TESTS/netsocket/README.md b/TESTS/netsocket/README.md
@@ -221,8 +221,6 @@ Please refer to the following table for priorities of test cases. Priorities are
 | 4   | UDPSOCKET_OPEN_CLOSE_REPEAT             | MUST     |
 | 5   | UDPSOCKET_BIND_PORT                     | SHOULD   |
 | 6   | UDPSOCKET_BIND_PORT_FAIL                | SHOULD   |
-| 7   | UDPSOCKET_BIND_ADDRESS_PORT             | SHOULD   |
-| 8   | UDPSOCKET_BIND_ADDRESS_NULL             | SHOULD   |
 | 9   | UDPSOCKET_BIND_ADDRESS_INVALID          | SHOULD   |
 | 10  | UDPSOCKET_BIND_WRONG_TYPE               | SHOULD   |
 | 11  | UDPSOCKET_BIND_ADDRESS                  | SHOULD   |
@@ -239,8 +237,6 @@ Please refer to the following table for priorities of test cases. Priorities are
 | 22  | TCPSOCKET_OPEN_CLOSE_REPEAT             | MUST     |
 | 23  | TCPSOCKET_BIND_PORT                     | SHOULD   |
 | 24  | TCPSOCKET_BIND_PORT_FAIL                | SHOULD   |
-| 25  | TCPSOCKET_BIND_ADDRESS_PORT             | SHOULD   |
-| 26  | TCPSOCKET_BIND_ADDRESS_NULL             | SHOULD   |
 | 27  | TCPSOCKET_BIND_ADDRESS_INVALID          | SHOULD   |
 | 28  | TCPSOCKET_BIND_WRONG_TYPE               | SHOULD   |
 | 29  | TCPSOCKET_BIND_ADDRESS                  | SHOULD   |
@@ -617,51 +613,6 @@ Call `Socket::bind(port)` on a port number that is already used.
 
 The second `Socket::bind()` returns `NSAPI_ERROR_PARAMETER`.
 
-### SOCKET_BIND_ADDRESS_PORT
-
-**Description:**
-
-Call `Socket::bind(addr, port)`.
-
-**Preconditions:**
-
-1. Network interface and stack are initialized.
-1. Network connection is up.
-
-**Test steps:**
-
-1. Create an object by calling `new Socket()`.
-1. Call `Socket::open(stack)`.
-1. Get address by calling `NetworkInterface::get_ip_address()`.
-1. Call `Socket::bind(address, <any unused port number>);`.
-1. Destroy the socket.
-
-**Expected result:**
-
-All calls return `NSAPI_ERROR_OK`.
-
-### SOCKET_BIND_ADDRESS_NULL
-
-**Description:**
-
-Call `Socket::bind(NULL, port)`.
-
-**Preconditions:**
-
-1. Network interface and stack are initialized.
-1. Network connection is up.
-
-**Test steps:**
-
-1. Create an object by calling `new Socket()`.
-1. Call `Socket::open(stack)`.
-1. Call `Socket::bind(NULL, <any unused port number>);`.
-1. Destroy the socket.
-
-**Expected result:**
-
-`Socket::bind()` returns `NSAPI_ERROR_OK`.
-
 ### SOCKET_BIND_ADDRESS_INVALID
 
 **Description:**
@@ -783,14 +734,6 @@ Test cases for UDPSocket class
 
 **Description:** Run `SOCKET_BIND_PORT_FAIL` for UDPSocket.
 
-### UDPSOCKET_BIND_ADDRESS_PORT
-
-**Description:** Run `SOCKET_BIND_ADDRESS_PORT` for UDPSocket.
-
-### UDPSOCKET_BIND_ADDRESS_NULL
-
-**Description:** Run `SOCKET_BIND_ADDRESS_NULL` for UDPSocket.
-
 ### UDPSOCKET_BIND_ADDRESS_INVALID
 
 **Description:** Run `SOCKET_BIND_ADDRESS_INVALID` for UDPSocket.
@@ -807,34 +750,6 @@ Test cases for UDPSocket class
 
 **Description:** Run `SOCKET_BIND_UNOPENED` for UDPSocket.
 
-### UDPSOCKET_SENDTO_INVALID
-
-**Description:**
-
-Call `UDPSocket::sendto()` with invalid parameters.
-
-**Preconditions:**
-
-1. Network interface and stack are initialized.
-1. Network connection is up.
-1. UDPSocket is open.
-
-**Test steps:**
-
-1. Call `UDPSocket:sendto( NULL, 9, NULL, 0);`.
-1. Call `UDPSocket:sendto( "", 9, NULL, 0);`.
-1. Call `UDPSocket:sendto( "", 0, NULL, 0);`.
-1. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9,NULL, 0);`.
-1. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9, "hello", 5);`.
-1. Destroy the socket.
-
-**Expected result:**
-
-All `sendto()` calls return an error code except:
-
--   Step 4 returns 0.
--   Step 5 returns 5.
-
 ### UDPSOCKET_SENDTO_REPEAT
 
 **Description:**
@@ -1000,14 +915,6 @@ Test cases for TCPSocket class
 
 **Description:** Run `SOCKET_BIND_PORT_FAIL` for TCPSocket.
 
-### TCPSOCKET_BIND_ADDRESS_PORT
-
-**Description:** Run `SOCKET_BIND_ADDRESS_PORT` for TCPSocket.
-
-### TCPSOCKET_BIND_ADDRESS_NULL
-
-**Description:** Run `SOCKET_BIND_ADDRESS_NULL` for TCPSocket.
-
 ### TCPSOCKET_BIND_ADDRESS_INVALID
 
 **Description:** Run `SOCKET_BIND_ADDRESS_INVALID` for TCPSocket.

diff --git a/TESTS/netsocket/dns/main.cpp b/TESTS/netsocket/dns/main.cpp
@@ -166,7 +166,8 @@ static void net_bringup()
     net = NetworkInterface::get_default_instance();
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
-    const char *address = net->get_ip_address();
+    SocketAddress address;
+    net->get_ip_address(&address);
 
 #define MESH 3
 #if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH
@@ -175,7 +176,7 @@ static void net_bringup()
         ThisThread::sleep_for(500);
     }
 #endif
-    printf("MBED: IP address is '%s'\n", address ? address : "null");
+    printf("MBED: IP address is '%s'\n", address ? address.get_ip_address() : "null");
 }
 
 static void net_bringdown()

diff --git a/TESTS/netsocket/tcp/main.cpp b/TESTS/netsocket/tcp/main.cpp
@@ -66,7 +66,7 @@ void drop_bad_packets(TCPSocket &sock, int orig_timeout)
 nsapi_version_t get_ip_version()
 {
     SocketAddress test;
-    if (!test.set_ip_address(NetworkInterface::get_default_instance()->get_ip_address())) {
+    if (NetworkInterface::get_default_instance()->get_ip_address(&test) != NSAPI_ERROR_OK) {
         return NSAPI_UNSPEC;
     }
     return test.get_ip_version();
@@ -77,7 +77,8 @@ static void _ifup()
     NetworkInterface *net = NetworkInterface::get_default_instance();
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
-    const char *address = net->get_ip_address();
+    SocketAddress address;
+    net->get_ip_address(&address);
 
 #define MESH 3
 #if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH
@@ -86,7 +87,7 @@ static void _ifup()
         ThisThread::sleep_for(500);
     }
 #endif
-    printf("MBED: TCPClient IP address is '%s'\n", address ? address : "null");
+    printf("MBED: TCPClient IP address is '%s'\n", address ? address.get_ip_address() : "null");
 }
 
 static void _ifdown()
@@ -221,8 +222,6 @@ Case cases[] = {
     Case("TCPSOCKET_OPEN_TWICE", TCPSOCKET_OPEN_TWICE),
     Case("TCPSOCKET_BIND_PORT", TCPSOCKET_BIND_PORT),
     Case("TCPSOCKET_BIND_PORT_FAIL", TCPSOCKET_BIND_PORT_FAIL),
-    Case("TCPSOCKET_BIND_ADDRESS_PORT", TCPSOCKET_BIND_ADDRESS_PORT),
-    Case("TCPSOCKET_BIND_ADDRESS_NULL", TCPSOCKET_BIND_ADDRESS_NULL),
     Case("TCPSOCKET_BIND_ADDRESS_INVALID", TCPSOCKET_BIND_ADDRESS_INVALID),
     Case("TCPSOCKET_BIND_ADDRESS", TCPSOCKET_BIND_ADDRESS),
     Case("TCPSOCKET_BIND_WRONG_TYPE", TCPSOCKET_BIND_WRONG_TYPE),

diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp
@@ -34,7 +34,9 @@ void TCPSOCKET_BIND_ADDRESS()
         return;
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
-    SocketAddress sockAddr = SocketAddress(NetworkInterface::get_default_instance()->get_ip_address(), 80);
+    SocketAddress sockAddr;
+    NetworkInterface::get_default_instance()->get_ip_address(&sockAddr);
+    sockAddr.set_port(80);
     nsapi_error_t bind_result = sock->bind(sockAddr);
     if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("bind() not supported");

diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp
@@ -29,17 +29,16 @@ using namespace utest::v1;
 void TCPSOCKET_BIND_ADDRESS_INVALID()
 {
     SKIP_IF_TCP_UNSUPPORTED();
-    TCPSocket *sock = new TCPSocket;
-    if (!sock) {
-        TEST_FAIL();
-        return;
-    }
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
+    TCPSocket sock;
+
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
     nsapi_error_t bind_result = NSAPI_ERROR_OK;
     if (get_ip_version() == NSAPI_IPv4) {
-        bind_result = sock->bind("190.2.3.4", 1024);
+        SocketAddress a("190.2.3.4", 1024);
+        bind_result = sock.bind(a);
     } else if (get_ip_version() == NSAPI_IPv6) {
-        bind_result = sock->bind("fe80::ff01", 1024);
+        SocketAddress a("fe80::ff01", 1024);
+        bind_result = sock.bind(a);
     } else {
         TEST_FAIL_MESSAGE("This stack is neither IPv4 nor IPv6");
     }
@@ -48,7 +47,5 @@ void TCPSOCKET_BIND_ADDRESS_INVALID()
     } else {
         TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result);
     }
-
-    delete sock;
 }
 #endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp
@@ -28,12 +28,9 @@ using namespace utest::v1;
 void TCPSOCKET_BIND_WRONG_TYPE()
 {
     SKIP_IF_TCP_UNSUPPORTED();
-    TCPSocket *sock = new TCPSocket;
-    if (!sock) {
-        TEST_FAIL();
-        return;
-    }
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
+    TCPSocket sock;
+
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
     char addr_bytes[16] = {0xfe, 0x80, 0xff, 0x1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     SocketAddress sockAddr;
     if (get_ip_version() == NSAPI_IPv4) {
@@ -43,13 +40,11 @@ void TCPSOCKET_BIND_WRONG_TYPE()
     } else {
         TEST_FAIL_MESSAGE("This stack is neither IPv4 nor IPv6");
     }
-    nsapi_error_t bind_result = sock->bind(sockAddr);
+    nsapi_error_t bind_result = sock.bind(sockAddr);
     if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("bind() not supported");
     } else {
         TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result);
     }
-
-    delete sock;
 }
 #endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp b/TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp
@@ -31,10 +31,15 @@ void TCPSOCKET_CONNECT_INVALID()
     TCPSocket sock;
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
 
-    TEST_ASSERT(sock.connect(NULL, 9) < 0);
-    TEST_ASSERT(sock.connect("", 9) < 0);
-    TEST_ASSERT(sock.connect("", 0) < 0);
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(ECHO_SERVER_ADDR, ECHO_SERVER_DISCARD_PORT));
+    SocketAddress address;
+    address.set_port(9);
+
+    TEST_ASSERT_FALSE(address.set_ip_address(NULL));
+
+    // Valid address for the final check
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &address));
+    address.set_port(ECHO_SERVER_DISCARD_PORT);
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(address));
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }

diff --git a/TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp b/TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp
@@ -41,7 +41,10 @@ void TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID()
     }
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, ret);
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(ECHO_SERVER_ADDR, 9));
+    SocketAddress address;
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &address));
+    address.set_port(9);
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(address));
     // LWIP stack does not support getsockopt so the part below is commented out
     //    int32_t optval;
     //    unsigned int optlen;