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/arp/arp_inout.c
+6 -6
View File
@@ -203,7 +203,7 @@ void arp_ipin(struct net_driver_s *dev)
* packet comes from a host on the local network.
*/
srcipaddr = uip_ip4addr_conv(IPBUF->eh_srcipaddr);
srcipaddr = net_ip4addr_conv32(IPBUF->eh_srcipaddr);
if (net_ipaddr_maskcmp(srcipaddr, dev->d_ipaddr, dev->d_netmask))
{
arp_update(IPBUF->eh_srcipaddr, ETHBUF->src);
@@ -246,7 +246,7 @@ void arp_arpin(struct net_driver_s *dev)
dev->d_len = 0;
ipaddr = uip_ip4addr_conv(parp->ah_dipaddr);
ipaddr = net_ip4addr_conv32(parp->ah_dipaddr);
switch(parp->ah_opcode)
{
case HTONS(ARP_REQUEST):
@@ -273,7 +273,7 @@ void arp_arpin(struct net_driver_s *dev)
parp->ah_dipaddr[0] = parp->ah_sipaddr[0];
parp->ah_dipaddr[1] = parp->ah_sipaddr[1];
uiphdr_ipaddr_copy(parp->ah_sipaddr, &dev->d_ipaddr);
net_ipaddr_hdrcopy(parp->ah_sipaddr, &dev->d_ipaddr);
arp_dump(parp);
peth->type = HTONS(UIP_ETHTYPE_ARP);
@@ -383,7 +383,7 @@ void arp_out(struct net_driver_s *dev)
{
/* Check if the destination address is on the local network. */
destipaddr = uip_ip4addr_conv(pip->eh_destipaddr);
destipaddr = net_ip4addr_conv32(pip->eh_destipaddr);
if (!net_ipaddr_maskcmp(destipaddr, dev->d_ipaddr, dev->d_netmask))
{
/* Destination address is not on the local network */
@@ -427,8 +427,8 @@ void arp_out(struct net_driver_s *dev)
memcpy(peth->src, dev->d_mac.ether_addr_octet, ETHER_ADDR_LEN);
memcpy(parp->ah_shwaddr, dev->d_mac.ether_addr_octet, ETHER_ADDR_LEN);
uiphdr_ipaddr_copy(parp->ah_dipaddr, &ipaddr);
uiphdr_ipaddr_copy(parp->ah_sipaddr, &dev->d_ipaddr);
net_ipaddr_hdrcopy(parp->ah_dipaddr, &ipaddr);
net_ipaddr_hdrcopy(parp->ah_sipaddr, &dev->d_ipaddr);
parp->ah_opcode = HTONS(ARP_REQUEST);
parp->ah_hwtype = HTONS(ARP_HWTYPE_ETH);
net/arp/arp_table.c
+1 -1
View File
@@ -148,7 +148,7 @@ void arp_timer(void)
void arp_update(uint16_t *pipaddr, uint8_t *ethaddr)
{
struct arp_entry *tabptr = NULL;
in_addr_t ipaddr = uip_ip4addr_conv(pipaddr);
in_addr_t ipaddr = net_ip4addr_conv32(pipaddr);
int i;
/* Walk through the ARP mapping table and try to find an entry to