Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

NET: Rename uiphdr_ipaddr_copy to net_ipaddr_hdrcopy, uip_ip4addr_conv to net_ip4addr_conv32, and uip_ethaddr_cmp to eth_addr_cmp

Browse Source
This commit is contained in:
Gregory Nutt
2014-06-29 13:20:00 -06:00
parent c362f21815
commit ad3e39e53d
13 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/icmp/icmp_input.c
+6 -6
View File
@@ -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);
}
net/icmp/icmp_send.c
+2 -2
View File
@@ -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. */