mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-17 20:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

lwiperf: enable TCP over IPv6 connections

Browse Source 
tested against iperf 2.0.10
redefine LWIPERF_SERVER_IP_TYPE if you don't want both IP versions
This commit is contained in:
goldsimon 2018-01-19 21:08:51 +01:00
parent a696b2b515
commit 9dbfa9ca0a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/apps/lwiperf/lwiperf.c
View File

@ -52,8 +52,8 @@
#include <string.h> #include <string.h>
/* Currently, only TCP-over-IPv4 is implemented (does iperf support IPv6 anyway?) */ /* Currently, only TCP is implemented (does iperf support IPv6 anyway?) */
#if LWIP_IPV4 && LWIP_TCP && LWIP_CALLBACK_API #if LWIP_TCP && LWIP_CALLBACK_API
/** Specify the idle timeout (in seconds) after that the test fails */ /** Specify the idle timeout (in seconds) after that the test fails */
#ifndef LWIPERF_TCP_MAX_IDLE_SEC #ifndef LWIPERF_TCP_MAX_IDLE_SEC
@ -63,6 +63,11 @@
#error LWIPERF_TCP_MAX_IDLE_SEC must fit into an u8_t #error LWIPERF_TCP_MAX_IDLE_SEC must fit into an u8_t
#endif #endif
/** Change this if you don't want to lwiperf to listen to any IP version */
#ifndef LWIPERF_SERVER_IP_TYPE
#define LWIPERF_SERVER_IP_TYPE IPADDR_TYPE_ANY
#endif
/* File internal memory allocation (struct lwiperf_*): this defaults to /* File internal memory allocation (struct lwiperf_*): this defaults to
the heap */ the heap */
#ifndef LWIPERF_ALLOC #ifndef LWIPERF_ALLOC
@ -365,7 +370,7 @@ lwiperf_tx_start(lwiperf_state_tcp_t *conn)
if (client_conn == NULL) { if (client_conn == NULL) {
return ERR_MEM; return ERR_MEM;
} }
newpcb = tcp_new(); newpcb = tcp_new_ip_type(IP_GET_TYPE(&conn->conn_pcb->remote_ip));
if (newpcb == NULL) { if (newpcb == NULL) {
LWIPERF_FREE(lwiperf_state_tcp_t, client_conn); LWIPERF_FREE(lwiperf_state_tcp_t, client_conn);
return ERR_MEM; return ERR_MEM;
@ -614,7 +619,7 @@ lwiperf_start_tcp_server(const ip_addr_t *local_addr, u16_t local_port,
s->report_fn = report_fn; s->report_fn = report_fn;
s->report_arg = report_arg; s->report_arg = report_arg;
pcb = tcp_new(); pcb = tcp_new_ip_type(LWIPERF_SERVER_IP_TYPE);
if (pcb != NULL) { if (pcb != NULL) {
err = tcp_bind(pcb, local_addr, local_port); err = tcp_bind(pcb, local_addr, local_port);
if (err == ERR_OK) { if (err == ERR_OK) {
@ -663,4 +668,4 @@ lwiperf_abort(void *lwiperf_session)
} }
} }
#endif /* LWIP_IPV4 && LWIP_TCP && LWIP_CALLBACK_API */ #endif /* LWIP_TCP && LWIP_CALLBACK_API */