diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-29 13:11:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-29 13:11:08 -0600 |
| commit | db01dd7d4bb05dcb6a12131beeb18e9dff8c09ce (patch) | |
| tree | bb51333d9bffe0423fb6b2e14136e611d3ebd31f /nuttx/net/udp | |
| parent | 47835f30174bd60663fc86eecf1c83a23ba59cac (diff) | |
| download | nuttx-db01dd7d4bb05dcb6a12131beeb18e9dff8c09ce.tar.gz nuttx-db01dd7d4bb05dcb6a12131beeb18e9dff8c09ce.tar.bz2 nuttx-db01dd7d4bb05dcb6a12131beeb18e9dff8c09ce.zip | |
NET: Rename uip_ipaddr* to net_ipaddr*
Diffstat (limited to 'nuttx/net/udp')
| -rw-r--r-- | nuttx/net/udp/udp_conn.c | 8 | ||||
| -rw-r--r-- | nuttx/net/udp/udp_send.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/net/udp/udp_conn.c b/nuttx/net/udp/udp_conn.c index 4640bdb77..1e4b2ff4f 100644 --- a/nuttx/net/udp/udp_conn.c +++ b/nuttx/net/udp/udp_conn.c @@ -319,8 +319,8 @@ FAR struct udp_conn_s *udp_active(FAR struct udp_iphdr_s *buf) if (conn->lport != 0 && buf->destport == conn->lport && (conn->rport == 0 || buf->srcport == conn->rport) && - (uip_ipaddr_cmp(conn->ripaddr, g_allzeroaddr) || - uip_ipaddr_cmp(conn->ripaddr, g_alloneaddr) || + (net_ipaddr_cmp(conn->ripaddr, g_allzeroaddr) || + net_ipaddr_cmp(conn->ripaddr, g_alloneaddr) || uiphdr_ipaddr_cmp(buf->srcipaddr, &conn->ripaddr))) { /* Matching connection found.. return a reference to it */ @@ -456,12 +456,12 @@ int udp_connect(FAR struct udp_conn_s *conn, if (addr) { conn->rport = addr->sin_port; - uip_ipaddr_copy(conn->ripaddr, addr->sin_addr.s_addr); + net_ipaddr_copy(conn->ripaddr, addr->sin_addr.s_addr); } else { conn->rport = 0; - uip_ipaddr_copy(conn->ripaddr, g_allzeroaddr); + net_ipaddr_copy(conn->ripaddr, g_allzeroaddr); } conn->ttl = UIP_TTL; diff --git a/nuttx/net/udp/udp_send.c b/nuttx/net/udp/udp_send.c index e41f00b4c..e9ca6b0c0 100644 --- a/nuttx/net/udp/udp_send.c +++ b/nuttx/net/udp/udp_send.c @@ -122,8 +122,8 @@ void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn) pudpbuf->nexthdr = UIP_PROTO_UDP; pudpbuf->hoplimit = conn->ttl; - uip_ipaddr_copy(pudpbuf->srcipaddr, &dev->d_ipaddr); - uip_ipaddr_copy(pudpbuf->destipaddr, &conn->ripaddr); + net_ipaddr_copy(pudpbuf->srcipaddr, &dev->d_ipaddr); + net_ipaddr_copy(pudpbuf->destipaddr, &conn->ripaddr); #else /* CONFIG_NET_IPv6 */ |