Skip to content

Commit 883295e

Browse files
michalpasztamobicamichalpasztamobica
committed
Remove internal usage of deprecated APIs in IPCore
Updated: * netsocket classes, * unittests, stubs and mocks, * greentea tests
1 parent a169edf commit 883295e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+308
-308
lines changed

‎TESTS/netsocket/dns/main.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ static void net_bringup()
166166
net = NetworkInterface::get_default_instance();
167167
nsapi_error_t err = net->connect();
168168
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
169-
const char *address = net->get_ip_address();
169+
SocketAddress address;
170+
net->get_ip_address(&address);
170171

171172
#define MESH 3
172173
#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH
@@ -175,7 +176,7 @@ static void net_bringup()
175176
ThisThread::sleep_for(500);
176177
}
177178
#endif
178-
printf("MBED: IP address is '%s'\n", address ? address : "null");
179+
printf("MBED: IP address is '%s'\n", address ? address.get_ip_address() : "null");
179180
}
180181

181182
static void net_bringdown()

‎TESTS/netsocket/tcp/main.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void drop_bad_packets(TCPSocket &sock, int orig_timeout)
6666
nsapi_version_t get_ip_version()
6767
{
6868
SocketAddress test;
69-
if (!test.set_ip_address(NetworkInterface::get_default_instance()->get_ip_address())) {
69+
if (NetworkInterface::get_default_instance()->get_ip_address(&test) != NSAPI_ERROR_OK) {
7070
return NSAPI_UNSPEC;
7171
}
7272
return test.get_ip_version();
@@ -77,7 +77,8 @@ static void _ifup()
7777
NetworkInterface *net = NetworkInterface::get_default_instance();
7878
nsapi_error_t err = net->connect();
7979
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
80-
const char *address = net->get_ip_address();
80+
SocketAddress address;
81+
net->get_ip_address(&address);
8182

8283
#define MESH 3
8384
#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH
@@ -86,7 +87,7 @@ static void _ifup()
8687
ThisThread::sleep_for(500);
8788
}
8889
#endif
89-
printf("MBED: TCPClient IP address is '%s'\n", address ? address : "null");
90+
printf("MBED: TCPClient IP address is '%s'\n", address ? address.get_ip_address() : "null");
9091
}
9192

9293
static void _ifdown()
@@ -221,8 +222,6 @@ Case cases[] = {
221222
Case("TCPSOCKET_OPEN_TWICE", TCPSOCKET_OPEN_TWICE),
222223
Case("TCPSOCKET_BIND_PORT", TCPSOCKET_BIND_PORT),
223224
Case("TCPSOCKET_BIND_PORT_FAIL", TCPSOCKET_BIND_PORT_FAIL),
224-
Case("TCPSOCKET_BIND_ADDRESS_PORT", TCPSOCKET_BIND_ADDRESS_PORT),
225-
Case("TCPSOCKET_BIND_ADDRESS_NULL", TCPSOCKET_BIND_ADDRESS_NULL),
226225
Case("TCPSOCKET_BIND_ADDRESS_INVALID", TCPSOCKET_BIND_ADDRESS_INVALID),
227226
Case("TCPSOCKET_BIND_ADDRESS", TCPSOCKET_BIND_ADDRESS),
228227
Case("TCPSOCKET_BIND_WRONG_TYPE", TCPSOCKET_BIND_WRONG_TYPE),

‎TESTS/netsocket/tcp/tcpsocket_bind_address.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ void TCPSOCKET_BIND_ADDRESS()
3434
return;
3535
}
3636
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
37-
SocketAddress sockAddr = SocketAddress(NetworkInterface::get_default_instance()->get_ip_address(), 80);
37+
SocketAddress sockAddr;
38+
NetworkInterface::get_default_instance()->get_ip_address(&sockAddr);
39+
sockAddr.set_port(80);
3840
nsapi_error_t bind_result = sock->bind(sockAddr);
3941
if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
4042
TEST_IGNORE_MESSAGE("bind() not supported");

‎TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,16 @@ using namespace utest::v1;
2929
void TCPSOCKET_BIND_ADDRESS_INVALID()
3030
{
3131
SKIP_IF_TCP_UNSUPPORTED();
32-
TCPSocket *sock = new TCPSocket;
33-
if (!sock) {
34-
TEST_FAIL();
35-
return;
36-
}
37-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
32+
TCPSocket sock;
33+
34+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
3835
nsapi_error_t bind_result = NSAPI_ERROR_OK;
3936
if (get_ip_version() == NSAPI_IPv4) {
40-
bind_result = sock->bind("190.2.3.4", 1024);
37+
SocketAddress a("190.2.3.4", 1024);
38+
bind_result = sock.bind(a);
4139
} else if (get_ip_version() == NSAPI_IPv6) {
42-
bind_result = sock->bind("fe80::ff01", 1024);
40+
SocketAddress a("fe80::ff01", 1024);
41+
bind_result = sock.bind(a);
4342
} else {
4443
TEST_FAIL_MESSAGE("This stack is neither IPv4 nor IPv6");
4544
}
@@ -48,7 +47,5 @@ void TCPSOCKET_BIND_ADDRESS_INVALID()
4847
} else {
4948
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result);
5049
}
51-
52-
delete sock;
5350
}
5451
#endif // defined(MBED_CONF_RTOS_PRESENT)

‎TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,9 @@ using namespace utest::v1;
2828
void TCPSOCKET_BIND_WRONG_TYPE()
2929
{
3030
SKIP_IF_TCP_UNSUPPORTED();
31-
TCPSocket *sock = new TCPSocket;
32-
if (!sock) {
33-
TEST_FAIL();
34-
return;
35-
}
36-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
31+
TCPSocket sock;
32+
33+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
3734
char addr_bytes[16] = {0xfe, 0x80, 0xff, 0x1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
3835
SocketAddress sockAddr;
3936
if (get_ip_version() == NSAPI_IPv4) {
@@ -43,13 +40,11 @@ void TCPSOCKET_BIND_WRONG_TYPE()
4340
} else {
4441
TEST_FAIL_MESSAGE("This stack is neither IPv4 nor IPv6");
4542
}
46-
nsapi_error_t bind_result = sock->bind(sockAddr);
43+
nsapi_error_t bind_result = sock.bind(sockAddr);
4744
if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
4845
TEST_IGNORE_MESSAGE("bind() not supported");
4946
} else {
5047
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result);
5148
}
52-
53-
delete sock;
5449
}
5550
#endif // defined(MBED_CONF_RTOS_PRESENT)

‎TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,15 @@ void TCPSOCKET_CONNECT_INVALID()
3131
TCPSocket sock;
3232
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
3333

34-
TEST_ASSERT(sock.connect(NULL, 9) < 0);
35-
TEST_ASSERT(sock.connect("", 9) < 0);
36-
TEST_ASSERT(sock.connect("", 0) < 0);
37-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(ECHO_SERVER_ADDR, ECHO_SERVER_DISCARD_PORT));
34+
SocketAddress address;
35+
address.set_port(9);
36+
37+
TEST_ASSERT_FALSE(address.set_ip_address(NULL));
38+
39+
// Valid address for the final check
40+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &address));
41+
address.set_port(ECHO_SERVER_DISCARD_PORT);
42+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(address));
3843

3944
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
4045
}

‎TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ void TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID()
4141
}
4242

4343
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, ret);
44-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(ECHO_SERVER_ADDR, 9));
44+
SocketAddress address;
45+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &address));
46+
address.set_port(9);
47+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(address));
4548
// LWIP stack does not support getsockopt so the part below is commented out
4649
// int32_t optval;
4750
// unsigned int optlen;

‎TESTS/netsocket/tls/main.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ static void _ifup()
7171
NetworkInterface *net = NetworkInterface::get_default_instance();
7272
nsapi_error_t err = net->connect();
7373
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
74-
const char *address = net->get_ip_address();
74+
SocketAddress address;
75+
net->get_ip_address(&address);
7576

7677
#define MESH 3
7778
#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH
@@ -80,7 +81,7 @@ static void _ifup()
8081
ThisThread::sleep_for(500);
8182
}
8283
#endif
83-
printf("MBED: TLSClient address is '%s'\n", address ? address : "null");
84+
printf("MBED: TLSClient address is '%s'\n", address ? address.get_ip_address() : "null");
8485
}
8586

8687
static void _ifdown()

‎TESTS/netsocket/tls/tlssocket_connect_invalid.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ void TLSSOCKET_CONNECT_INVALID()
3333
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
3434
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.set_root_ca_cert(tls_global::cert));
3535

36-
TEST_ASSERT(sock.connect(NULL, ECHO_SERVER_DISCARD_PORT_TLS) < 0);
37-
TEST_ASSERT(sock.connect("", ECHO_SERVER_DISCARD_PORT_TLS) < 0);
38-
TEST_ASSERT(sock.connect("", 0) < 0);
36+
SocketAddress address;
37+
TEST_ASSERT(sock.connect(address) < 0);
3938

39+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &address));
40+
address.set_port(ECHO_SERVER_DISCARD_PORT_TLS);
4041
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK,
41-
sock.connect(ECHO_SERVER_ADDR, ECHO_SERVER_DISCARD_PORT_TLS));
42+
sock.connect(address));
4243

4344
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
4445
}

‎TESTS/netsocket/tls/tlssocket_handshake_invalid.cpp

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,49 @@ void TLSSOCKET_HANDSHAKE_INVALID()
3030
{
3131
const int https_port = 443;
3232
SKIP_IF_TCP_UNSUPPORTED();
33+
NetworkInterface* net = NetworkInterface::get_default_instance();
3334

3435
#if (MBED_CONF_NSAPI_DEFAULT_STACK == NANOSTACK || (MBED_CONF_NSAPI_DEFAULT_STACK == LWIP && defined(MBED_CONF_LWIP_PPP_IPV6_ENABLED)))
3536
SocketAddress address;
36-
nsapi_error_t result = NetworkInterface::get_default_instance()->gethostbyname("expired.badssl.com", &address);
37+
nsapi_error_t result = net->gethostbyname("expired.badssl.com", &address);
3738
if (result != NSAPI_ERROR_OK) {
3839
TEST_SKIP_MESSAGE(" badssl.com not supported IP6 AAA records");
3940
}
4041
#endif
4142
TLSSocket sock;
42-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
43+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(net));
4344
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.set_root_ca_cert(tls_global::cert));
44-
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect("expired.badssl.com", https_port));
45-
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect("wrong.host.badssl.com", https_port));
46-
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect("self-signed.badssl.com", https_port));
47-
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect("untrusted-root.badssl.com", https_port));
48-
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect("revoked.badssl.com", https_port));
49-
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect("pinning-test.badssl.com", https_port));
50-
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect("sha1-intermediate.badssl.com", https_port));
45+
46+
SocketAddress a;
47+
48+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname("expired.badssl.com", &a));
49+
a.set_port(https_port);
50+
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect(a));
51+
52+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname("wrong.host.badssl.com", &a));
53+
a.set_port(https_port);
54+
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect(a));
55+
56+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname("self-signed.badssl.com", &a));
57+
a.set_port(https_port);
58+
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect(a));
59+
60+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname("untrusted-root.badssl.com", &a));
61+
a.set_port(https_port);
62+
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect(a));
63+
64+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname("revoked.badssl.com", &a));
65+
a.set_port(https_port);
66+
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect(a));
67+
68+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname("pinning-test.badssl.com", &a));
69+
a.set_port(https_port);
70+
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect(a));
71+
72+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, net->gethostbyname("sha1-intermediate.badssl.com", &a));
73+
a.set_port(https_port);
74+
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE, sock.connect(a));
75+
5176
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
5277
}
5378

‎TESTS/netsocket/tls/tlssocket_no_cert.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ void TLSSOCKET_NO_CERT()
3131
SKIP_IF_TCP_UNSUPPORTED();
3232
TLSSocket sock;
3333
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
34+
SocketAddress a;
35+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &a));
36+
a.set_port(ECHO_SERVER_PORT_TLS);
3437
TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE,
35-
sock.connect(ECHO_SERVER_ADDR, ECHO_SERVER_PORT_TLS));
38+
sock.connect(a));
3639
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
3740
}
3841

‎TESTS/netsocket/tls/tlssocket_send_closed.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ void TLSSOCKET_SEND_CLOSED()
3232
TLSSocket sock;
3333
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
3434
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.set_root_ca_cert(tls_global::cert));
35-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK,
36-
sock.connect(ECHO_SERVER_ADDR, ECHO_SERVER_PORT_TLS));
35+
SocketAddress a;
36+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &a));
37+
a.set_port(ECHO_SERVER_PORT_TLS);
38+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(a));
3739
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
3840
TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, sock.send("12345", 5));
3941
}

0 commit comments

Comments
 (0)