diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-29 13:20:00 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-29 13:20:00 -0600 |
| commit | 123d85fbe1dfa189d58db4af7d543e7fe166549e (patch) | |
| tree | c2d91b9511fb02caa7e15024ec847c1f4f72d67d /nuttx/net/icmp | |
| parent | db01dd7d4bb05dcb6a12131beeb18e9dff8c09ce (diff) | |
| download | px4-nuttx-123d85fbe1dfa189d58db4af7d543e7fe166549e.tar.gz px4-nuttx-123d85fbe1dfa189d58db4af7d543e7fe166549e.tar.bz2 px4-nuttx-123d85fbe1dfa189d58db4af7d543e7fe166549e.zip | |
NET: Rename uiphdr_ipaddr_copy to net_ipaddr_hdrcopy, uip_ip4addr_conv to net_ip4addr_conv32, and uip_ethaddr_cmp to eth_addr_cmp
Diffstat (limited to 'nuttx/net/icmp')
| -rw-r--r-- | nuttx/net/icmp/icmp_input.c | 12 | ||||
| -rw-r--r-- | nuttx/net/icmp/icmp_send.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/net/icmp/icmp_input.c b/nuttx/net/icmp/icmp_input.c index ef02b3ad7..25dbf1a4a 100644 --- a/nuttx/net/icmp/icmp_input.c +++ b/nuttx/net/icmp/icmp_input.c @@ -140,8 +140,8 @@ void icmp_input(FAR struct net_driver_s *dev) /* Swap IP addresses. */ - uiphdr_ipaddr_copy(picmp->destipaddr, picmp->srcipaddr); - uiphdr_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr); + net_ipaddr_hdrcopy(picmp->destipaddr, picmp->srcipaddr); + net_ipaddr_hdrcopy(picmp->srcipaddr, &dev->d_ipaddr); /* Recalculate the ICMP checksum */ @@ -232,8 +232,8 @@ typeerr: picmp->reserved1 = picmp->reserved2 = picmp->reserved3 = 0; - uiphdr_ipaddr_copy(picmp->destipaddr, picmp->srcipaddr); - uiphdr_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr); + net_ipaddr_hdrcopy(picmp->destipaddr, picmp->srcipaddr); + net_ipaddr_hdrcopy(picmp->srcipaddr, &dev->d_ipaddr); picmp->options[0] = ICMP6_OPTION_TARGET_LINK_ADDRESS; picmp->options[1] = 1; /* Options length, 1 = 8 bytes. */ memcpy(&(picmp->options[2]), &dev->d_mac, IFHWADDRLEN); @@ -254,8 +254,8 @@ typeerr: picmp->type = ICMP6_ECHO_REPLY; - uiphdr_ipaddr_copy(picmp->destipaddr, picmp->srcipaddr); - uiphdr_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr); + net_ipaddr_hdrcopy(picmp->destipaddr, picmp->srcipaddr); + net_ipaddr_hdrcopy(picmp->srcipaddr, &dev->d_ipaddr); picmp->icmpchksum = 0; picmp->icmpchksum = ~icmp_6chksum(dev); } diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c index a004a96cd..443600f1c 100644 --- a/nuttx/net/icmp/icmp_send.c +++ b/nuttx/net/icmp/icmp_send.c @@ -139,8 +139,8 @@ void icmp_send(FAR struct net_driver_s *dev, FAR net_ipaddr_t *destaddr) picmp->ttl = UIP_TTL; picmp->proto = UIP_PROTO_ICMP; - uiphdr_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr); - uiphdr_ipaddr_copy(picmp->destipaddr, destaddr); + net_ipaddr_hdrcopy(picmp->srcipaddr, &dev->d_ipaddr); + net_ipaddr_hdrcopy(picmp->destipaddr, destaddr); /* Calculate IP checksum. */ |