mirror of https://github.com/ARMmbed/mbed-os.git
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.pull/3265/head
parent
9df82e5811
commit
8e7a3c8b04
|
|
@ -10,11 +10,17 @@
|
||||||
#include "EthernetInterface.h"
|
#include "EthernetInterface.h"
|
||||||
#include "UDPSocket.h"
|
#include "UDPSocket.h"
|
||||||
#include "greentea-client/test_env.h"
|
#include "greentea-client/test_env.h"
|
||||||
|
#include "unity/unity.h"
|
||||||
|
|
||||||
#ifndef MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE
|
#ifndef MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE
|
||||||
#define MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE 256
|
#define MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE 256
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MBED_CFG_UDP_CLIENT_ECHO_TIMEOUT
|
||||||
|
#define MBED_CFG_UDP_CLIENT_ECHO_TIMEOUT 500
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
char tx_buffer[MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE] = {0};
|
char tx_buffer[MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE] = {0};
|
||||||
char rx_buffer[MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE] = {0};
|
char rx_buffer[MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE] = {0};
|
||||||
|
|
@ -37,8 +43,6 @@ int main() {
|
||||||
|
|
||||||
greentea_send_kv("target_ip", eth.get_ip_address());
|
greentea_send_kv("target_ip", eth.get_ip_address());
|
||||||
|
|
||||||
bool result = false;
|
|
||||||
|
|
||||||
char recv_key[] = "host_port";
|
char recv_key[] = "host_port";
|
||||||
char ipbuf[60] = {0};
|
char ipbuf[60] = {0};
|
||||||
char portbuf[16] = {0};
|
char portbuf[16] = {0};
|
||||||
|
|
@ -46,6 +50,7 @@ int main() {
|
||||||
|
|
||||||
UDPSocket sock;
|
UDPSocket sock;
|
||||||
sock.open(ð);
|
sock.open(ð);
|
||||||
|
sock.set_timeout(MBED_CFG_UDP_CLIENT_ECHO_TIMEOUT);
|
||||||
|
|
||||||
greentea_send_kv("host_ip", " ");
|
greentea_send_kv("host_ip", " ");
|
||||||
greentea_parse_kv(recv_key, ipbuf, sizeof(recv_key), sizeof(ipbuf));
|
greentea_parse_kv(recv_key, ipbuf, sizeof(recv_key), sizeof(ipbuf));
|
||||||
|
|
@ -55,24 +60,27 @@ int main() {
|
||||||
sscanf(portbuf, "%u", &port);
|
sscanf(portbuf, "%u", &port);
|
||||||
|
|
||||||
printf("MBED: UDP Server IP address received: %s:%d \n", ipbuf, port);
|
printf("MBED: UDP Server IP address received: %s:%d \n", ipbuf, port);
|
||||||
|
SocketAddress udp_addr(ipbuf, port);
|
||||||
|
|
||||||
SocketAddress addr(ipbuf, port);
|
int success = 0;
|
||||||
|
|
||||||
for (int i=0; i < ECHO_LOOPS; ++i) {
|
for (int i=0; i < ECHO_LOOPS; ++i) {
|
||||||
prep_buffer(tx_buffer, sizeof(tx_buffer));
|
prep_buffer(tx_buffer, sizeof(tx_buffer));
|
||||||
const int ret = sock.sendto(addr, tx_buffer, sizeof(tx_buffer));
|
const int ret = sock.sendto(udp_addr, tx_buffer, sizeof(tx_buffer));
|
||||||
printf("[%02d] sent...%d Bytes \n", i, ret);
|
printf("[%02d] sent...%d Bytes \n", i, ret);
|
||||||
|
|
||||||
const int n = sock.recvfrom(&addr, rx_buffer, sizeof(rx_buffer));
|
SocketAddress temp_addr;
|
||||||
|
const int n = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer));
|
||||||
printf("[%02d] recv...%d Bytes \n", i, n);
|
printf("[%02d] recv...%d Bytes \n", i, n);
|
||||||
|
|
||||||
if (memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer))) {
|
if ((temp_addr == udp_addr &&
|
||||||
result = false;
|
n == sizeof(tx_buffer) &&
|
||||||
break;
|
memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0)) {
|
||||||
|
success += 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
result = true;
|
bool result = (success > 3*ECHO_LOOPS/4);
|
||||||
}
|
|
||||||
|
|
||||||
sock.close();
|
sock.close();
|
||||||
eth.disconnect();
|
eth.disconnect();
|
||||||
|
|
|
||||||
|
|
@ -69,12 +69,15 @@ public:
|
||||||
printf("[%02d] sent...%d Bytes \n", i, ret);
|
printf("[%02d] sent...%d Bytes \n", i, ret);
|
||||||
iomutex.unlock();
|
iomutex.unlock();
|
||||||
|
|
||||||
const int n = sock.recvfrom(&udp_addr, rx_buffer, sizeof(rx_buffer));
|
SocketAddress temp_addr;
|
||||||
|
const int n = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer));
|
||||||
iomutex.lock();
|
iomutex.lock();
|
||||||
printf("[%02d] recv...%d Bytes \n", i, n);
|
printf("[%02d] recv...%d Bytes \n", i, n);
|
||||||
iomutex.unlock();
|
iomutex.unlock();
|
||||||
|
|
||||||
if (memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0) {
|
if ((temp_addr == udp_addr &&
|
||||||
|
n == sizeof(tx_buffer) &&
|
||||||
|
memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0)) {
|
||||||
success += 1;
|
success += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue