Skip to content

Commit 8e7a3c8

Browse files
committed
lwip - Added handling of packet loss to udp echo test
Before the test would only succeed if all packets (16) succeed. Updated to succeed if 75% succed.
1 parent 9df82e5 commit 8e7a3c8

File tree

2 files changed

+23
-12
lines changed
  • features/FEATURE_LWIP/TESTS/mbedmicro-net

2 files changed

+23
-12
lines changed

features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo/main.cpp

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@
1010
#include "EthernetInterface.h"
1111
#include "UDPSocket.h"
1212
#include "greentea-client/test_env.h"
13+
#include "unity/unity.h"
1314

1415
#ifndef MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE
1516
#define MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE 256
1617
#endif
1718

19+
#ifndef MBED_CFG_UDP_CLIENT_ECHO_TIMEOUT
20+
#define MBED_CFG_UDP_CLIENT_ECHO_TIMEOUT 500
21+
#endif
22+
23+
1824
namespace {
1925
char tx_buffer[MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE] = {0};
2026
char rx_buffer[MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE] = {0};
@@ -37,15 +43,14 @@ int main() {
3743

3844
greentea_send_kv("target_ip", eth.get_ip_address());
3945

40-
bool result = false;
41-
4246
char recv_key[] = "host_port";
4347
char ipbuf[60] = {0};
4448
char portbuf[16] = {0};
4549
unsigned int port = 0;
4650

4751
UDPSocket sock;
4852
sock.open(&eth);
53+
sock.set_timeout(MBED_CFG_UDP_CLIENT_ECHO_TIMEOUT);
4954

5055
greentea_send_kv("host_ip", " ");
5156
greentea_parse_kv(recv_key, ipbuf, sizeof(recv_key), sizeof(ipbuf));
@@ -55,25 +60,28 @@ int main() {
5560
sscanf(portbuf, "%u", &port);
5661

5762
printf("MBED: UDP Server IP address received: %s:%d \n", ipbuf, port);
63+
SocketAddress udp_addr(ipbuf, port);
5864

59-
SocketAddress addr(ipbuf, port);
65+
int success = 0;
6066

6167
for (int i=0; i < ECHO_LOOPS; ++i) {
6268
prep_buffer(tx_buffer, sizeof(tx_buffer));
63-
const int ret = sock.sendto(addr, tx_buffer, sizeof(tx_buffer));
69+
const int ret = sock.sendto(udp_addr, tx_buffer, sizeof(tx_buffer));
6470
printf("[%02d] sent...%d Bytes \n", i, ret);
6571

66-
const int n = sock.recvfrom(&addr, rx_buffer, sizeof(rx_buffer));
72+
SocketAddress temp_addr;
73+
const int n = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer));
6774
printf("[%02d] recv...%d Bytes \n", i, n);
6875

69-
if (memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer))) {
70-
result = false;
71-
break;
76+
if ((temp_addr == udp_addr &&
77+
n == sizeof(tx_buffer) &&
78+
memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0)) {
79+
success += 1;
7280
}
73-
74-
result = true;
7581
}
7682

83+
bool result = (success > 3*ECHO_LOOPS/4);
84+
7785
sock.close();
7886
eth.disconnect();
7987
GREENTEA_TESTSUITE_RESULT(result);

features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_parallel/main.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,15 @@ class Echo {
6969
printf("[%02d] sent...%d Bytes \n", i, ret);
7070
iomutex.unlock();
7171

72-
const int n = sock.recvfrom(&udp_addr, rx_buffer, sizeof(rx_buffer));
72+
SocketAddress temp_addr;
73+
const int n = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer));
7374
iomutex.lock();
7475
printf("[%02d] recv...%d Bytes \n", i, n);
7576
iomutex.unlock();
7677

77-
if (memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0) {
78+
if ((temp_addr == udp_addr &&
79+
n == sizeof(tx_buffer) &&
80+
memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0)) {
7881
success += 1;
7982
}
8083
}

0 commit comments

Comments
 (0)