abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 21:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Implement dual-stack in lwiperf, netbiosns and sntp

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2016-03-03 12:15:57 +01:00
parent b0d4386744
commit 24ebf6bd6f
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -587,6 +587,9 @@ lwiperf_start_tcp_server(const ip_addr_t* local_addr, u16_t local_port,
{ {
err_t err; err_t err;
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
if(local_addr == NULL) {
return NULL;
}
lwiperf_state_tcp_t* s = (lwiperf_state_tcp_t*)LWIPERF_ALLOC(lwiperf_state_tcp_t); lwiperf_state_tcp_t* s = (lwiperf_state_tcp_t*)LWIPERF_ALLOC(lwiperf_state_tcp_t);
if (s == NULL) { if (s == NULL) {
return NULL; return NULL;
@ -597,7 +600,11 @@ 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(); if(IP_IS_ANY_TYPE_VAL(*local_addr)) {
pcb = tcp_new_ip_type(IPADDR_TYPE_ANY);
} else {
pcb = tcp_new();
}
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) {

4
src/apps/netbiosns/netbiosns.c
View File

@ -315,11 +315,11 @@ netbiosns_init(void)
LWIP_ASSERT("NetBIOS name is too long!", strlen(NETBIOS_LWIP_NAME) < NETBIOS_NAME_LEN); LWIP_ASSERT("NetBIOS name is too long!", strlen(NETBIOS_LWIP_NAME) < NETBIOS_NAME_LEN);
#endif #endif
netbiosns_pcb = udp_new(); netbiosns_pcb = udp_new_ip_type(IPADDR_TYPE_ANY);
if (netbiosns_pcb != NULL) { if (netbiosns_pcb != NULL) {
/* we have to be allowed to send broadcast packets! */ /* we have to be allowed to send broadcast packets! */
netbiosns_pcb->so_options |= SOF_BROADCAST; netbiosns_pcb->so_options |= SOF_BROADCAST;
udp_bind(netbiosns_pcb, IP_ADDR_ANY, NETBIOS_PORT); udp_bind(netbiosns_pcb, IP_ANY_TYPE, NETBIOS_PORT);
udp_recv(netbiosns_pcb, netbiosns_recv, netbiosns_pcb); udp_recv(netbiosns_pcb, netbiosns_recv, netbiosns_pcb);
} }
} }

4
src/apps/sntp/sntp.c
View File

@ -538,7 +538,7 @@ sntp_init(void)
#endif /* SNTP_SERVER_ADDRESS */ #endif /* SNTP_SERVER_ADDRESS */
if (sntp_pcb == NULL) { if (sntp_pcb == NULL) {
sntp_pcb = udp_new(); sntp_pcb = udp_new_ip_type(IPADDR_TYPE_ANY);
LWIP_ASSERT("Failed to allocate udp pcb for sntp client", sntp_pcb != NULL); LWIP_ASSERT("Failed to allocate udp pcb for sntp client", sntp_pcb != NULL);
if (sntp_pcb != NULL) { if (sntp_pcb != NULL) {
udp_recv(sntp_pcb, sntp_recv, NULL); udp_recv(sntp_pcb, sntp_recv, NULL);
@ -552,7 +552,7 @@ sntp_init(void)
#endif #endif
} else if (sntp_opmode == SNTP_OPMODE_LISTENONLY) { } else if (sntp_opmode == SNTP_OPMODE_LISTENONLY) {
ip_set_option(sntp_pcb, SOF_BROADCAST); ip_set_option(sntp_pcb, SOF_BROADCAST);
udp_bind(sntp_pcb, IP_ADDR_ANY, SNTP_PORT); udp_bind(sntp_pcb, IP_ANY_TYPE, SNTP_PORT);
} }
} }
} }