Skip to content

Commit dba3962

Browse files
0xc01700xc0170
authored
Merge pull request #12570 from kjbracey-arm/nsapics
Improve nsapi_create_stack
2 parents 9bea150 + 4759e9d commit dba3962

File tree

11 files changed

+117
-117
lines changed

11 files changed

+117
-117
lines changed

‎UNITTESTS/features/netsocket/DTLSSocket/test_DTLSSocket.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ TEST_F(TestDTLSSocket, constructor)
5858

5959
TEST_F(TestDTLSSocket, connect)
6060
{
61-
socket->open((NetworkStack *)&stack);
61+
socket->open(&stack);
6262

6363
stack.return_value = NSAPI_ERROR_OK;
6464
SocketAddress a("127.0.0.1", 1024);

‎UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ TEST_F(TestDTLSSocketWrapper, constructor_hostname)
111111

112112
TEST_F(TestDTLSSocketWrapper, connect)
113113
{
114-
transport->open((NetworkStack *)&stack);
114+
transport->open(&stack);
115115
const SocketAddress a("127.0.0.1", 1024);
116116
stack.return_socketAddress = a;
117117
EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
@@ -129,7 +129,7 @@ TEST_F(TestDTLSSocketWrapper, connect_no_open)
129129

130130
TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_handshake)
131131
{
132-
transport->open((NetworkStack *)&stack);
132+
transport->open(&stack);
133133
mbedtls_stub.useCounter = true;
134134
mbedtls_stub.retArray[1] = -1; // mbedtls_ssl_handshake error
135135
const SocketAddress a("127.0.0.1", 1024);
@@ -139,7 +139,7 @@ TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_handshake)
139139

140140
TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_handshake_in_progress)
141141
{
142-
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
142+
EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
143143
mbedtls_stub.useCounter = true;
144144
wrapper->set_timeout(1);
145145
eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
@@ -151,7 +151,7 @@ TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_handshake_in_progress)
151151

152152
TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_get_verify_result)
153153
{
154-
transport->open((NetworkStack *)&stack);
154+
transport->open(&stack);
155155
mbedtls_stub.uint32_value = 1; // mbedtls_ssl_get_verify_result error
156156
const SocketAddress a("127.0.0.1", 1024);
157157
stack.return_socketAddress = a;
@@ -160,7 +160,7 @@ TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_get_verify_result)
160160

161161
TEST_F(TestDTLSSocketWrapper, connect_fail_ctr_drbg_seed)
162162
{
163-
transport->open((NetworkStack *)&stack);
163+
transport->open(&stack);
164164
mbedtls_stub.crt_expected_int = 1; // mbedtls_ctr_drbg_seed error
165165
stack.return_value = NSAPI_ERROR_OK;
166166
const SocketAddress a("127.0.0.1", 1024);
@@ -171,7 +171,7 @@ TEST_F(TestDTLSSocketWrapper, connect_fail_ctr_drbg_seed)
171171

172172
TEST_F(TestDTLSSocketWrapper, connect_fail_ssl_setup)
173173
{
174-
transport->open((NetworkStack *)&stack);
174+
transport->open(&stack);
175175
mbedtls_stub.useCounter = true;
176176
mbedtls_stub.retArray[0] = 2; // mbedtls_ssl_setup error
177177
stack.return_value = NSAPI_ERROR_OK;
@@ -192,7 +192,7 @@ TEST_F(TestDTLSSocketWrapper, send_in_one_chunk)
192192
{
193193
mbedtls_stub.useCounter = true;
194194
mbedtls_stub.retArray[2] = dataSize; // mbedtls_ssl_write
195-
transport->open((NetworkStack *)&stack);
195+
transport->open(&stack);
196196
const SocketAddress a("127.0.0.1", 1024);
197197
stack.return_socketAddress = a;
198198
EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
@@ -203,7 +203,7 @@ TEST_F(TestDTLSSocketWrapper, send_in_two_chunks)
203203
{
204204
mbedtls_stub.useCounter = true;
205205
mbedtls_stub.retArray[2] = dataSize; // mbedtls_ssl_write
206-
transport->open((NetworkStack *)&stack);
206+
transport->open(&stack);
207207
const SocketAddress a("127.0.0.1", 1024);
208208
stack.return_socketAddress = a;
209209
EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
@@ -212,7 +212,7 @@ TEST_F(TestDTLSSocketWrapper, send_in_two_chunks)
212212

213213
TEST_F(TestDTLSSocketWrapper, send_error_would_block)
214214
{
215-
transport->open((NetworkStack *)&stack);
215+
transport->open(&stack);
216216
mbedtls_stub.useCounter = true;
217217
mbedtls_stub.retArray[2] = MBEDTLS_ERR_SSL_WANT_WRITE; // mbedtls_ssl_write
218218
eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
@@ -224,7 +224,7 @@ TEST_F(TestDTLSSocketWrapper, send_error_would_block)
224224

225225
TEST_F(TestDTLSSocketWrapper, send_to)
226226
{
227-
transport->open((NetworkStack *)&stack);
227+
transport->open(&stack);
228228
mbedtls_stub.useCounter = true;
229229

230230
mbedtls_stub.retArray[2] = dataSize; // mbedtls_ssl_write
@@ -244,7 +244,7 @@ TEST_F(TestDTLSSocketWrapper, recv_no_open)
244244

245245
TEST_F(TestDTLSSocketWrapper, recv_all_data)
246246
{
247-
transport->open((NetworkStack *)&stack);
247+
transport->open(&stack);
248248
mbedtls_stub.useCounter = true;
249249
mbedtls_stub.retArray[2] = dataSize; // mbedtls_ssl_write
250250
const SocketAddress a("127.0.0.1", 1024);
@@ -255,7 +255,7 @@ TEST_F(TestDTLSSocketWrapper, recv_all_data)
255255

256256
TEST_F(TestDTLSSocketWrapper, recv_less_than_expected)
257257
{
258-
transport->open((NetworkStack *)&stack);
258+
transport->open(&stack);
259259
unsigned int lessThanDataSize = dataSize - 1;
260260
mbedtls_stub.useCounter = true;
261261
mbedtls_stub.retArray[2] = lessThanDataSize; // mbedtls_ssl_write
@@ -267,7 +267,7 @@ TEST_F(TestDTLSSocketWrapper, recv_less_than_expected)
267267

268268
TEST_F(TestDTLSSocketWrapper, recv_would_block)
269269
{
270-
transport->open((NetworkStack *)&stack);
270+
transport->open(&stack);
271271
mbedtls_stub.useCounter = true;
272272
mbedtls_stub.retArray[2] = MBEDTLS_ERR_SSL_WANT_WRITE; // mbedtls_ssl_write
273273
const SocketAddress a("127.0.0.1", 1024);
@@ -286,7 +286,7 @@ TEST_F(TestDTLSSocketWrapper, recv_from_no_socket)
286286
TEST_F(TestDTLSSocketWrapper, recv_from)
287287
{
288288
SocketAddress a("127.0.0.1", 1024);
289-
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
289+
EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
290290
stack.return_socketAddress = a;
291291
EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
292292
SocketAddress b;
@@ -296,7 +296,7 @@ TEST_F(TestDTLSSocketWrapper, recv_from)
296296
TEST_F(TestDTLSSocketWrapper, recv_from_null)
297297
{
298298
SocketAddress a("127.0.0.1", 1024);
299-
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
299+
EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
300300
stack.return_socketAddress = a;
301301
EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
302302
EXPECT_EQ(wrapper->recvfrom(NULL, dataBuf, dataSize), NSAPI_ERROR_OK);
@@ -307,20 +307,20 @@ TEST_F(TestDTLSSocketWrapper, recv_from_null)
307307
TEST_F(TestDTLSSocketWrapper, set_root_ca_cert)
308308
{
309309
EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
310-
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
310+
EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
311311
EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK);
312312
EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
313313
}
314314

315315
TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_nolen)
316316
{
317-
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
317+
EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
318318
EXPECT_EQ(wrapper->set_root_ca_cert(cert), NSAPI_ERROR_OK);
319319
}
320320

321321
TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_invalid)
322322
{
323-
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
323+
EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
324324
mbedtls_stub.useCounter = true;
325325
mbedtls_stub.counter = 0;
326326
mbedtls_stub.retArray[0] = 1; // mbedtls_x509_crt_parse error
@@ -332,22 +332,22 @@ TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_invalid)
332332
TEST_F(TestDTLSSocketWrapper, set_client_cert_key)
333333
{
334334
EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
335-
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
335+
EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
336336
EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK);
337337
EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
338338
}
339339

340340
TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid)
341341
{
342-
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
342+
EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
343343
mbedtls_stub.useCounter = true;
344344
mbedtls_stub.retArray[0] = 1; // mbedtls_x509_crt_parse error
345345
EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_PARAMETER);
346346
}
347347

348348
TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid_pem)
349349
{
350-
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
350+
EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
351351
mbedtls_stub.useCounter = true;
352352
mbedtls_stub.retArray[0] = 0; // mbedtls_x509_crt_parse ok
353353
mbedtls_stub.retArray[1] = 1; // mbedtls_pk_parse_key error
@@ -356,7 +356,7 @@ TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid_pem)
356356

357357
TEST_F(TestDTLSSocketWrapper, bind)
358358
{
359-
transport->open((NetworkStack *)&stack);
359+
transport->open(&stack);
360360
SocketAddress a("127.0.0.1", 1024);
361361
EXPECT_EQ(wrapper->bind(a), NSAPI_ERROR_OK);
362362
}
@@ -369,7 +369,7 @@ TEST_F(TestDTLSSocketWrapper, bind_no_open)
369369

370370
TEST_F(TestDTLSSocketWrapper, sigio)
371371
{
372-
transport->open((NetworkStack *)&stack);
372+
transport->open(&stack);
373373
callback_is_called = false;
374374
wrapper->sigio(mbed::callback(my_callback));
375375
SocketAddress a("127.0.0.1", 1024);
@@ -379,7 +379,7 @@ TEST_F(TestDTLSSocketWrapper, sigio)
379379

380380
TEST_F(TestDTLSSocketWrapper, setsockopt)
381381
{
382-
transport->open((NetworkStack *)&stack);
382+
transport->open(&stack);
383383
EXPECT_EQ(wrapper->setsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
384384
}
385385

@@ -390,7 +390,7 @@ TEST_F(TestDTLSSocketWrapper, getsockopt_no_stack)
390390

391391
TEST_F(TestDTLSSocketWrapper, getsockopt)
392392
{
393-
transport->open((NetworkStack *)&stack);
393+
transport->open(&stack);
394394
EXPECT_EQ(wrapper->getsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
395395
}
396396

‎UNITTESTS/features/netsocket/InternetSocket/test_InternetSocket.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,26 +125,26 @@ TEST_F(TestInternetSocket, open_null_stack)
125125
TEST_F(TestInternetSocket, open_error)
126126
{
127127
stack.return_value = NSAPI_ERROR_PARAMETER;
128-
EXPECT_EQ(socket->open((NetworkStack *)&stack), NSAPI_ERROR_PARAMETER);
128+
EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_PARAMETER);
129129
}
130130

131131
TEST_F(TestInternetSocket, open)
132132
{
133133
stack.return_value = NSAPI_ERROR_OK;
134-
EXPECT_EQ(socket->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
134+
EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_OK);
135135
}
136136

137137
TEST_F(TestInternetSocket, open_twice)
138138
{
139139
stack.return_value = NSAPI_ERROR_OK;
140-
EXPECT_EQ(socket->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
141-
EXPECT_EQ(socket->open((NetworkStack *)&stack), NSAPI_ERROR_PARAMETER);
140+
EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_OK);
141+
EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_PARAMETER);
142142
}
143143

144144
TEST_F(TestInternetSocket, close)
145145
{
146146
stack.return_value = NSAPI_ERROR_OK;
147-
socket->open((NetworkStack *)&stack);
147+
socket->open(&stack);
148148
EXPECT_EQ(socket->close(), NSAPI_ERROR_OK);
149149
}
150150

@@ -157,7 +157,7 @@ TEST_F(TestInternetSocket, close_no_open)
157157
TEST_F(TestInternetSocket, close_during_read)
158158
{
159159
stack.return_value = NSAPI_ERROR_OK;
160-
socket->open((NetworkStack *)&stack);
160+
socket->open(&stack);
161161
// Simulate the blocking behavior by adding a reader.
162162
socket->add_reader();
163163
// The reader will be removed after we attempt to close the socket.
@@ -180,7 +180,7 @@ TEST_F(TestInternetSocket, modify_multicast_group)
180180
{
181181
SocketAddress a("127.0.0.1", 1024);
182182
stack.return_value = NSAPI_ERROR_OK;
183-
socket->open((NetworkStack *)&stack);
183+
socket->open(&stack);
184184
EXPECT_EQ(socket->join_multicast_group(a), NSAPI_ERROR_UNSUPPORTED);
185185
EXPECT_EQ(socket->leave_multicast_group(a), NSAPI_ERROR_UNSUPPORTED);
186186
}
@@ -194,7 +194,7 @@ TEST_F(TestInternetSocket, bind_no_socket)
194194

195195
TEST_F(TestInternetSocket, bind)
196196
{
197-
socket->open((NetworkStack *)&stack);
197+
socket->open(&stack);
198198
SocketAddress a("127.0.0.1", 80);
199199
EXPECT_EQ(socket->bind(a), NSAPI_ERROR_OK);
200200
}
@@ -208,7 +208,7 @@ TEST_F(TestInternetSocket, setsockopt_no_stack)
208208

209209
TEST_F(TestInternetSocket, setsockopt)
210210
{
211-
socket->open((NetworkStack *)&stack);
211+
socket->open(&stack);
212212
EXPECT_EQ(socket->setsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
213213
}
214214

@@ -219,14 +219,14 @@ TEST_F(TestInternetSocket, getsockopt_no_stack)
219219

220220
TEST_F(TestInternetSocket, getsockopt)
221221
{
222-
socket->open((NetworkStack *)&stack);
222+
socket->open(&stack);
223223
EXPECT_EQ(socket->getsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
224224
}
225225

226226
TEST_F(TestInternetSocket, sigio)
227227
{
228228
callback_is_called = false;
229-
socket->open((NetworkStack *)&stack);
229+
socket->open(&stack);
230230
socket->sigio(mbed::callback(my_callback));
231231
socket->close(); // Trigger event;
232232
EXPECT_EQ(callback_is_called, true);
@@ -241,7 +241,7 @@ TEST_F(TestInternetSocket, getpeername)
241241

242242
EXPECT_EQ(socket->getpeername(&peer), NSAPI_ERROR_NO_SOCKET);
243243

244-
socket->open((NetworkStack *)&stack);
244+
socket->open(&stack);
245245
socket->connect(zero);
246246

247247
EXPECT_EQ(socket->getpeername(&peer), NSAPI_ERROR_NO_CONNECTION);

‎UNITTESTS/features/netsocket/TCPServer/test_TCPServer.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ TEST_F(TestTCPServer, constructor)
5454

5555
TEST_F(TestTCPServer, constructor_parameters)
5656
{
57-
TCPServer serverParam = TCPServer(dynamic_cast<NetworkStack *>(&stack));
57+
TCPServer serverParam = TCPServer(&stack);
5858
const SocketAddress a("127.0.0.1", 1024);
5959
EXPECT_EQ(serverParam.connect(a), NSAPI_ERROR_OK);
6060
}
6161

6262
TEST_F(TestTCPServer, accept)
6363
{
6464
const SocketAddress a("127.0.0.1", 1024);
65-
EXPECT_EQ(socket->open(static_cast<NetworkStack *>(&stack)), NSAPI_ERROR_OK);
65+
EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_OK);
6666
EXPECT_EQ(socket->connect(a), NSAPI_ERROR_OK);
6767
nsapi_error_t error;
68-
EXPECT_EQ(server->open(static_cast<NetworkStack *>(&stack)), NSAPI_ERROR_OK);
68+
EXPECT_EQ(server->open(&stack), NSAPI_ERROR_OK);
6969
EXPECT_EQ(server->bind(a), NSAPI_ERROR_OK);
7070
server->listen(1);
7171
SocketAddress client_addr;
@@ -81,15 +81,15 @@ TEST_F(TestTCPServer, accept_no_socket)
8181
TEST_F(TestTCPServer, accept_error)
8282
{
8383
SocketAddress client_addr;
84-
EXPECT_EQ(server->open(static_cast<NetworkStack *>(&stack)), NSAPI_ERROR_OK);
84+
EXPECT_EQ(server->open(&stack), NSAPI_ERROR_OK);
8585
stack.return_value = NSAPI_ERROR_AUTH_FAILURE;
8686
EXPECT_EQ(server->accept(socket, &client_addr), NSAPI_ERROR_AUTH_FAILURE);
8787
}
8888

8989
TEST_F(TestTCPServer, accept_error_would_block)
9090
{
9191
SocketAddress client_addr;
92-
EXPECT_EQ(server->open(static_cast<NetworkStack *>(&stack)), NSAPI_ERROR_OK);
92+
EXPECT_EQ(server->open(&stack), NSAPI_ERROR_OK);
9393
stack.return_value = NSAPI_ERROR_WOULD_BLOCK;
9494
eventFlagsStubNextRetval.push_back(0);
9595
eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop

0 commit comments

Comments
 (0)