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

Merge branch 'socket_open_deprecated' of https://github.com/michalpasztamobica/mbed-os into dev_rollup

pull/8838/head
Martin Kojtal 2018-11-23 18:38:02 +00:00
parent 36bc2efdec 42940fab3c
commit b9ea30abf1
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UNITTESTS/features/netsocket/TCPSocket/test_TCPSocket.cpp
View File

@ -62,7 +62,8 @@ TEST_F(TestTCPSocket, constructor)
TEST_F(TestTCPSocket, constructor_parameters) TEST_F(TestTCPSocket, constructor_parameters)
{ {
TCPSocket socketParam = TCPSocket(dynamic_cast<NetworkStack *>(&stack)); TCPSocket socketParam = TCPSocket();
socketParam.open(dynamic_cast<NetworkStack *>(&stack));
const SocketAddress a("127.0.0.1", 1024); const SocketAddress a("127.0.0.1", 1024);
EXPECT_EQ(socketParam.connect(a), NSAPI_ERROR_OK); EXPECT_EQ(socketParam.connect(a), NSAPI_ERROR_OK);
} }

6
features/netsocket/TCPSocket.h
View File

@ -42,8 +42,14 @@ public:
* network interface. * network interface.
* *
* @param stack Network stack as target for socket * @param stack Network stack as target for socket
*
* @deprecated since mbed-os-5.11
*/ */
template <typename S> template <typename S>
MBED_DEPRECATED_SINCE("mbed-os-5.11",
"The TCPSocket(S *stack) constructor is deprecated."
"It discards the open() call return value."
"Use another constructor and call open() explicitly, instead.")
TCPSocket(S *stack) TCPSocket(S *stack)
{ {
open(stack); open(stack);

16
features/netsocket/TLSSocket.h
View File

@ -45,22 +45,6 @@ public:
*/ */
virtual ~TLSSocket(); virtual ~TLSSocket();
/** Create a socket on a network interface
*
* Creates and opens a socket on the network stack of the given
* network interface.
* If hostname is also given, user is not required to call set_hostname() later.
*
* @param stack Network stack as target for socket
* @param hostname Hostname used for certificate verification
*/
template <typename S>
TLSSocket(S *stack, const char *hostname = NULL) : TLSSocketWrapper(&tcp_socket, hostname)
{
nsapi_error_t ret = tcp_socket.open(stack);
MBED_ASSERT(ret == NSAPI_ERROR_OK);
}
/** Opens a socket /** Opens a socket
* *
* Creates a network socket on the network stack of the given * Creates a network socket on the network stack of the given

5
features/netsocket/UDPSocket.h
View File

@ -41,8 +41,13 @@ public:
* *
* @tparam S Type of the Network stack. * @tparam S Type of the Network stack.
* @param stack Network stack as target for socket. * @param stack Network stack as target for socket.
* @deprecated since mbed-os-5.11
*/ */
template <typename S> template <typename S>
MBED_DEPRECATED_SINCE("mbed-os-5.11",
"The UDPSocket(S *stack) constructor is deprecated"
"It discards the open() call return value."
"Use another constructor and call open() explicitly, instead.")
UDPSocket(S *stack) UDPSocket(S *stack)
{ {
open(stack); open(stack);