mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
sockets_stresstest.c: some compile and runtime fixes
This commit is contained in:
parent
6e624f8035
commit
f8f31218d1
@ -410,7 +410,7 @@ sockets_stresstest_conn_client(void *arg)
|
|||||||
fill_test_data(txbuf, send_len);
|
fill_test_data(txbuf, send_len);
|
||||||
printf("cli %d tx %d\n", s, (int)send_len);
|
printf("cli %d tx %d\n", s, (int)send_len);
|
||||||
ret = lwip_write(s, txbuf, send_len);
|
ret = lwip_write(s, txbuf, send_len);
|
||||||
LWIP_ASSERT("ret >= 0", ret >= 0);
|
LWIP_ASSERT("ret == send_len", ret == (int)send_len);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ret = lwip_close(s);
|
ret = lwip_close(s);
|
||||||
@ -442,7 +442,6 @@ sockets_stresstest_conn_server(void *arg)
|
|||||||
if (ret) {
|
if (ret) {
|
||||||
if (ret & TEST_SOCK_ERR) {
|
if (ret & TEST_SOCK_ERR) {
|
||||||
/* closed? */
|
/* closed? */
|
||||||
lwip_close(s);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* read some */
|
/* read some */
|
||||||
@ -457,7 +456,14 @@ sockets_stresstest_conn_server(void *arg)
|
|||||||
fill_test_data(txbuf, send_len);
|
fill_test_data(txbuf, send_len);
|
||||||
printf("srv %d tx %d\n", s, (int)send_len);
|
printf("srv %d tx %d\n", s, (int)send_len);
|
||||||
ret = lwip_write(s, txbuf, send_len);
|
ret = lwip_write(s, txbuf, send_len);
|
||||||
LWIP_ASSERT("ret >= 0", ret >= 0);
|
if (ret == -1) {
|
||||||
|
/* TODO: for this to work, 'errno' has to support multithreading... */
|
||||||
|
int err = errno;
|
||||||
|
if (err == ECONNRESET) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
LWIP_ASSERT("ret == send_len", ret == (int)send_len);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ret = lwip_close(s);
|
ret = lwip_close(s);
|
||||||
@ -538,7 +544,7 @@ sockets_stresstest_init_loopback(int addr_family)
|
|||||||
memset(settings, 0, sizeof(struct test_settings));
|
memset(settings, 0, sizeof(struct test_settings));
|
||||||
#if LWIP_IPV4 && LWIP_IPV6
|
#if LWIP_IPV4 && LWIP_IPV6
|
||||||
LWIP_ASSERT("invalid addr_family", (addr_family == AF_INET) || (addr_family == AF_INET6));
|
LWIP_ASSERT("invalid addr_family", (addr_family == AF_INET) || (addr_family == AF_INET6));
|
||||||
settings->addr.ss_family = addr_family;
|
settings->addr.ss_family = (sa_family_t)addr_family;
|
||||||
#endif
|
#endif
|
||||||
LWIP_UNUSED_ARG(addr_family);
|
LWIP_UNUSED_ARG(addr_family);
|
||||||
settings->start_client = 1;
|
settings->start_client = 1;
|
||||||
@ -548,7 +554,7 @@ sockets_stresstest_init_loopback(int addr_family)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
sockets_stresstest_init_server(u16_t server_port)
|
sockets_stresstest_init_server(int addr_family, u16_t server_port)
|
||||||
{
|
{
|
||||||
sys_thread_t t;
|
sys_thread_t t;
|
||||||
struct test_settings *settings = (struct test_settings *)mem_malloc(sizeof(struct test_settings));
|
struct test_settings *settings = (struct test_settings *)mem_malloc(sizeof(struct test_settings));
|
||||||
@ -557,7 +563,7 @@ sockets_stresstest_init_server(u16_t server_port)
|
|||||||
memset(settings, 0, sizeof(struct test_settings));
|
memset(settings, 0, sizeof(struct test_settings));
|
||||||
#if LWIP_IPV4 && LWIP_IPV6
|
#if LWIP_IPV4 && LWIP_IPV6
|
||||||
LWIP_ASSERT("invalid addr_family", (addr_family == AF_INET) || (addr_family == AF_INET6));
|
LWIP_ASSERT("invalid addr_family", (addr_family == AF_INET) || (addr_family == AF_INET6));
|
||||||
settings->addr.ss_family = addr_family;
|
settings->addr.ss_family = (sa_family_t)addr_family;
|
||||||
#endif
|
#endif
|
||||||
((struct sockaddr_in *)(&settings->addr))->sin_port = server_port;
|
((struct sockaddr_in *)(&settings->addr))->sin_port = server_port;
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#define LWIP_HDR_TEST_SOCKETS_STRESSTEST
|
#define LWIP_HDR_TEST_SOCKETS_STRESSTEST
|
||||||
|
|
||||||
void sockets_stresstest_init_loopback(int addr_family);
|
void sockets_stresstest_init_loopback(int addr_family);
|
||||||
void sockets_stresstest_init_server(u16_t server_port);
|
void sockets_stresstest_init_server(int addr_family, u16_t server_port);
|
||||||
void sockets_stresstest_init_client(const char *remote_ip, u16_t remote_port);
|
void sockets_stresstest_init_client(const char *remote_ip, u16_t remote_port);
|
||||||
|
|
||||||
#endif /* LWIP_HDR_TEST_SOCKETS_STRESSTEST */
|
#endif /* LWIP_HDR_TEST_SOCKETS_STRESSTEST */
|
||||||
|
Loading…
Reference in New Issue
Block a user