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

Fixing some issues in the tcp/udp tests

pull/4369/head
Brian Daniels 2017-05-01 17:28:16 -05:00 committed by Martin Kojtal
parent f313bc2988
commit 70dd7cc273
3 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features/FEATURE_LWIP/TESTS/mbedmicro-net/tcp_echo_parallel/main.cpp
View File

@ -64,7 +64,7 @@ public:
TEST_ASSERT_EQUAL(0, err);
iomutex.lock();
printf("HTTP: Connected to %s:%d\r\n",
printf("HTTP: Connected to %s:%d\r\n",
tcp_addr.get_ip_address(), tcp_addr.get_port());
printf("tx_buffer buffer size: %u\r\n", sizeof(tx_buffer));
printf("rx_buffer buffer size: %u\r\n", sizeof(rx_buffer));
@ -85,7 +85,8 @@ public:
};
int main() {
GREENTEA_SETUP(60, "tcp_echo");
char uuid[48] = {0};
GREENTEA_SETUP_UUID(60, "tcp_echo", uuid, 48);
Echo echoers[MBED_CFG_TCP_CLIENT_ECHO_THREADS];

17
features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo/main.cpp
View File

@ -83,10 +83,23 @@ int main() {
while (success < ECHO_LOOPS) {
prep_buffer(uuid, uuid_len, tx_buffer, sizeof(tx_buffer));
const int ret = sock.sendto(udp_addr, tx_buffer, sizeof(tx_buffer));
printf("[%02d] sent %d Bytes - %.*s \n", i, ret, MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE, tx_buffer);
if (ret >= 0) {
printf("[%02d] sent %d Bytes - %.*s \n", i, ret, ret, tx_buffer);
} else {
printf("[%02d] Network error %d\n", i, ret);
i++;
continue;
}
SocketAddress temp_addr;
const int n = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer));
printf("[%02d] recv %d Bytes - %.*s \n", i, ret, MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE, rx_buffer);
if (n >= 0) {
printf("[%02d] receive %d Bytes - %.*s \n", i, n, n, tx_buffer);
} else {
printf("[%02d] Network error %d\n", i, n);
i++;
continue;
}
if ((temp_addr == udp_addr &&
n == sizeof(tx_buffer) &&

28
features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_parallel/main.cpp
View File

@ -90,15 +90,31 @@ public:
while(success < ECHO_LOOPS) {
prep_buffer(id, uuid_buffer, uuid_len, tx_buffer, sizeof(tx_buffer));
const int ret = sock.sendto(udp_addr, tx_buffer, sizeof(tx_buffer));
iomutex.lock();
printf("[ID:%01d][%02d] sent %d Bytes - %.*s\n", id, i, ret, MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE, tx_buffer);
iomutex.unlock();
if (ret >= 0) {
iomutex.lock();
printf("[ID:%01d][%02d] sent %d Bytes - %.*s \n", id, i, ret, ret, tx_buffer);
iomutex.unlock();
} else {
iomutex.lock();
printf("[ID:%01d][%02d] Network error %d\n", id, i, ret);
iomutex.unlock();
i++;
continue;
}
SocketAddress temp_addr;
const int n = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer));
iomutex.lock();
printf("[ID:%01d][%02d] recv %d Bytes - %.*s\n", id, i, ret, MBED_CFG_UDP_CLIENT_ECHO_BUFFER_SIZE, rx_buffer);
iomutex.unlock();
if (n >= 0) {
iomutex.lock();
printf("[ID:%01d][%02d] receive %d Bytes - %.*s \n", id, i, n, n, tx_buffer);
iomutex.unlock();
} else {
iomutex.lock();
printf("[ID:%01d][%02d] Network error %d\n", id, i, n);
iomutex.unlock();
i++;
continue;
}
if ((temp_addr == udp_addr &&
n == sizeof(tx_buffer) &&