diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-16 13:01:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-16 13:01:08 -0600 |
| commit | 403cc094e22feb6565ded93f8346a8446bf4ddbb (patch) | |
| tree | 7b2706373a3d000f9dd145e7c14547e6106de25d /nuttx/net/tcp | |
| parent | 1cab7bb6d184c0bba4889bf6eac7a863f0f242c7 (diff) | |
| download | px4-nuttx-403cc094e22feb6565ded93f8346a8446bf4ddbb.tar.gz px4-nuttx-403cc094e22feb6565ded93f8346a8446bf4ddbb.tar.bz2 px4-nuttx-403cc094e22feb6565ded93f8346a8446bf4ddbb.zip | |
Networking: Replace all references to the macros net_ipaddr_copy, net_ipaddr_hdrcopy, net_ipaddr_cmp, net_ipaddr_hdrcmp, and net_ipaddr_maskcmp with the appropriate IPv4 or IPv6 version of the macro (such as net_ipv4addr_copy). The goal is to support both IPv4 and IPv6 simultaneously. This requires that the macros be distinct and not conditionally defined to one on or the other.
Diffstat (limited to 'nuttx/net/tcp')
| -rw-r--r-- | nuttx/net/tcp/tcp_conn.c | 14 | ||||
| -rw-r--r-- | nuttx/net/tcp/tcp_send.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nuttx/net/tcp/tcp_conn.c b/nuttx/net/tcp/tcp_conn.c index f23694c5e..f2cc71914 100644 --- a/nuttx/net/tcp/tcp_conn.c +++ b/nuttx/net/tcp/tcp_conn.c @@ -524,10 +524,10 @@ FAR struct tcp_conn_s *tcp_active(FAR struct net_driver_s *dev, tcp->destport == conn->lport && tcp->srcport == conn->rport && #ifdef CONFIG_NETDEV_MULTINIC - (net_ipaddr_cmp(conn->u.ipv4.laddr, g_ipv4_allzeroaddr) || - net_ipaddr_cmp(destipaddr, conn->u.ipv4.laddr)) && + (net_ipv4addr_cmp(conn->u.ipv4.laddr, g_ipv4_allzeroaddr) || + net_ipv4addr_cmp(destipaddr, conn->u.ipv4.laddr)) && #endif - net_ipaddr_cmp(srcipaddr, conn->u.ipv4.raddr)) + net_ipv4addr_cmp(srcipaddr, conn->u.ipv4.raddr)) { /* Matching connection found.. break out of the loop and return a * reference to it. @@ -600,9 +600,9 @@ FAR struct tcp_conn_s *tcp_alloc_accept(FAR struct net_driver_s *dev, conn->lport = tcp->destport; conn->rport = tcp->srcport; conn->mss = TCP_INITIAL_MSS(dev); - net_ipaddr_copy(conn->u.ipv4.raddr, net_ip4addr_conv32(ip->srcipaddr)); + net_ipv4addr_copy(conn->u.ipv4.raddr, net_ip4addr_conv32(ip->srcipaddr)); #ifdef CONFIG_NETDEV_MULTINIC - net_ipaddr_copy(conn->u.ipv4.laddr, net_ip4addr_conv32(ip->destipaddr)); + net_ipv4addr_copy(conn->u.ipv4.laddr, net_ip4addr_conv32(ip->destipaddr)); #endif conn->tcpstateflags = TCP_SYN_RCVD; @@ -706,7 +706,7 @@ int tcp_bind(FAR struct tcp_conn_s *conn, conn->lport = addr->sin_port; #ifdef CONFIG_NETDEV_MULTINIC - net_ipaddr_copy(conn->u.ipv4.laddr, ipaddr); + net_ipv4addr_copy(conn->u.ipv4.laddr, ipaddr); #endif return OK; @@ -800,7 +800,7 @@ int tcp_connect(FAR struct tcp_conn_s *conn, /* The sockaddr address is 32-bits in network order. */ - net_ipaddr_copy(conn->u.ipv4.raddr, addr->sin_addr.s_addr); + net_ipv4addr_copy(conn->u.ipv4.raddr, addr->sin_addr.s_addr); #ifdef CONFIG_NET_TCP_READAHEAD /* Initialize the list of TCP read-ahead buffers */ diff --git a/nuttx/net/tcp/tcp_send.c b/nuttx/net/tcp/tcp_send.c index 7fbb0e045..1a70b6ab6 100644 --- a/nuttx/net/tcp/tcp_send.c +++ b/nuttx/net/tcp/tcp_send.c @@ -187,8 +187,8 @@ static void tcp_sendcommon(FAR struct net_driver_s *dev, pbuf->srcport = conn->lport; pbuf->destport = conn->rport; - net_ipaddr_hdrcopy(pbuf->srcipaddr, &dev->d_ipaddr); - net_ipaddr_hdrcopy(pbuf->destipaddr, &conn->u.ipv4.raddr); + net_ipv4addr_hdrcopy(pbuf->srcipaddr, &dev->d_ipaddr); + net_ipv4addr_hdrcopy(pbuf->destipaddr, &conn->u.ipv4.raddr); if (conn->tcpstateflags & TCP_STOPPED) { @@ -320,8 +320,8 @@ void tcp_reset(FAR struct net_driver_s *dev) /* Swap IP addresses. */ - net_ipaddr_hdrcopy(pbuf->destipaddr, pbuf->srcipaddr); - net_ipaddr_hdrcopy(pbuf->srcipaddr, &dev->d_ipaddr); + net_ipv4addr_hdrcopy(pbuf->destipaddr, pbuf->srcipaddr); + net_ipv4addr_hdrcopy(pbuf->srcipaddr, &dev->d_ipaddr); /* And send out the RST packet */ |