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 new style TCP dual-stack in netconn API

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2016-03-02 23:46:22 +01:00
parent e89b48d23f
commit 0c673b6a44
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/api/api_msg.c
View File

@ -543,7 +543,11 @@ pcb_new(struct api_msg_msg *msg)
#endif /* LWIP_UDP */ #endif /* LWIP_UDP */
#if LWIP_TCP #if LWIP_TCP
case NETCONN_TCP: case NETCONN_TCP:
msg->conn->pcb.tcp = tcp_new(); if(NETCONNTYPE_ANYIP(msg->conn->type)) {
msg->conn->pcb.tcp = tcp_new_ip_type(IPADDR_TYPE_ANY);
} else {
msg->conn->pcb.tcp = tcp_new();
}
if (msg->conn->pcb.tcp != NULL) { if (msg->conn->pcb.tcp != NULL) {
setup_tcp(msg->conn); setup_tcp(msg->conn);
} }
@ -1270,22 +1274,19 @@ lwip_netconn_do_listen(struct api_msg_msg *msg)
/* connection is not closed, cannot listen */ /* connection is not closed, cannot listen */
msg->err = ERR_VAL; msg->err = ERR_VAL;
} else { } else {
#if LWIP_IPV6 #if LWIP_IPV4 && LWIP_IPV6
if ((msg->conn->flags & NETCONN_FLAG_IPV6_V6ONLY) == 0) { if (ip_addr_isany_val(msg->conn->pcb.tcp->local_ip) &&
#if TCP_LISTEN_BACKLOG ((msg->conn->flags & NETCONN_FLAG_IPV6_V6ONLY) == 0)) {
lpcb = tcp_listen_dual_with_backlog(msg->conn->pcb.tcp, msg->msg.lb.backlog); IP_SET_TYPE_VAL(msg->conn->pcb.tcp->local_ip, IPADDR_TYPE_ANY);
#else /* TCP_LISTEN_BACKLOG */
lpcb = tcp_listen_dual(msg->conn->pcb.tcp);
#endif /* TCP_LISTEN_BACKLOG */
} else
#endif /* LWIP_IPV6 */
{
#if TCP_LISTEN_BACKLOG
lpcb = tcp_listen_with_backlog(msg->conn->pcb.tcp, msg->msg.lb.backlog);
#else /* TCP_LISTEN_BACKLOG */
lpcb = tcp_listen(msg->conn->pcb.tcp);
#endif /* TCP_LISTEN_BACKLOG */
} }
#endif /* LWIP_IPV4 && LWIP_IPV6 */
#if TCP_LISTEN_BACKLOG
lpcb = tcp_listen_with_backlog(msg->conn->pcb.tcp, msg->msg.lb.backlog);
#else /* TCP_LISTEN_BACKLOG */
lpcb = tcp_listen(msg->conn->pcb.tcp);
#endif /* TCP_LISTEN_BACKLOG */
if (lpcb == NULL) { if (lpcb == NULL) {
/* in this case, the old pcb is still allocated */ /* in this case, the old pcb is still allocated */
msg->err = ERR_MEM; msg->err = ERR_MEM;

4
src/include/lwip/api.h
View File

@ -121,8 +121,8 @@ enum netconn_type {
#endif /* LWIP_IPV6 */ #endif /* LWIP_IPV6 */
/* NETCONN dual stack */ /* NETCONN dual stack */
/* NETCONN_TCP_IPANY = NETCONN_TCP | NETCONN_TYPE_IP_ANY, */ /* 0x14 */ NETCONN_TCP_IPANY = NETCONN_TCP | NETCONN_TYPE_IP_ANY, /* 0x14 */
NETCONN_UDP_IPANY = NETCONN_UDP | NETCONN_TYPE_IP_ANY /* 0x24 */ NETCONN_UDP_IPANY = NETCONN_UDP | NETCONN_TYPE_IP_ANY /* 0x24 */
/* NETCONN_RAW_IPANY = NETCONN_RAW | NETCONN_TYPE_IP_ANY, */ /* 0x44 */ /* NETCONN_RAW_IPANY = NETCONN_RAW | NETCONN_TYPE_IP_ANY, */ /* 0x44 */
}; };