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 | |
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')
-rw-r--r-- | nuttx/net/arp/arp_inout.c | 12 | ||||
-rw-r--r-- | nuttx/net/arp/arp_table.c | 2 | ||||
-rw-r--r-- | nuttx/net/devif/devif_input.c | 6 | ||||
-rw-r--r-- | nuttx/net/icmp/icmp_input.c | 12 | ||||
-rw-r--r-- | nuttx/net/icmp/icmp_send.c | 4 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_input.c | 4 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_send.c | 6 | ||||
-rw-r--r-- | nuttx/net/pkt/pkt_conn.c | 4 | ||||
-rw-r--r-- | nuttx/net/socket/recvfrom.c | 6 | ||||
-rw-r--r-- | nuttx/net/tcp/tcp_conn.c | 4 | ||||
-rw-r--r-- | nuttx/net/tcp/tcp_send.c | 8 | ||||
-rw-r--r-- | nuttx/net/udp/udp_send.c | 4 |
12 files changed, 37 insertions, 35 deletions
diff --git a/nuttx/net/arp/arp_inout.c b/nuttx/net/arp/arp_inout.c index a0a8d4438..e4b7f1f72 100644 --- a/nuttx/net/arp/arp_inout.c +++ b/nuttx/net/arp/arp_inout.c @@ -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); diff --git a/nuttx/net/arp/arp_table.c b/nuttx/net/arp/arp_table.c index d0ce37e18..b6c361285 100644 --- a/nuttx/net/arp/arp_table.c +++ b/nuttx/net/arp/arp_table.c @@ -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 diff --git a/nuttx/net/devif/devif_input.c b/nuttx/net/devif/devif_input.c index ec14b1ae3..56c73bc61 100644 --- a/nuttx/net/devif/devif_input.c +++ b/nuttx/net/devif/devif_input.c @@ -413,7 +413,7 @@ int uip_input(FAR struct net_driver_s *dev) #if defined(CONFIG_NET_BROADCAST) && defined(CONFIG_NET_UDP) if (pbuf->proto == UIP_PROTO_UDP && #ifndef CONFIG_NET_IPv6 - net_ipaddr_cmp(uip_ip4addr_conv(pbuf->destipaddr), g_alloneaddr)) + net_ipaddr_cmp(net_ip4addr_conv32(pbuf->destipaddr), g_alloneaddr)) #else net_ipaddr_cmp(pbuf->destipaddr, g_alloneaddr)) #endif @@ -457,10 +457,10 @@ int uip_input(FAR struct net_driver_s *dev) { /* Check if the packet is destined for our IP address. */ #ifndef CONFIG_NET_IPv6 - if (!net_ipaddr_cmp(uip_ip4addr_conv(pbuf->destipaddr), dev->d_ipaddr)) + if (!net_ipaddr_cmp(net_ip4addr_conv32(pbuf->destipaddr), dev->d_ipaddr)) { #ifdef CONFIG_NET_IGMP - net_ipaddr_t destip = uip_ip4addr_conv(pbuf->destipaddr); + net_ipaddr_t destip = net_ip4addr_conv32(pbuf->destipaddr); if (igmp_grpfind(dev, &destip) == NULL) #endif { 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. */ diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c index 8ec707c56..b3f2090bb 100644 --- a/nuttx/net/igmp/igmp_input.c +++ b/nuttx/net/igmp/igmp_input.c @@ -142,7 +142,7 @@ void igmp_input(struct net_driver_s *dev) /* Find the group (or create a new one) using the incoming IP address*/ - destipaddr = uip_ip4addr_conv(IGMPBUF->destipaddr); + destipaddr = net_ip4addr_conv32(IGMPBUF->destipaddr); group = igmp_grpallocfind(dev, &destipaddr); if (!group) { @@ -226,7 +226,7 @@ void igmp_input(struct net_driver_s *dev) */ IGMP_STATINCR(g_netstats.igmp.ucast_query); - grpaddr = uip_ip4addr_conv(IGMPBUF->grpaddr); + grpaddr = net_ip4addr_conv32(IGMPBUF->grpaddr); group = igmp_grpallocfind(dev, &grpaddr); ticks = igmp_decisec2tick((int)IGMPBUF->maxresp); if (IS_IDLEMEMBER(group->flags) || igmp_cmptimer(group, ticks)) diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c index a4735f622..5134b2b51 100644 --- a/nuttx/net/igmp/igmp_send.c +++ b/nuttx/net/igmp/igmp_send.c @@ -154,8 +154,8 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, IGMPBUF->ttl = IGMP_TTL; IGMPBUF->proto = UIP_PROTO_IGMP; - uiphdr_ipaddr_copy(IGMPBUF->srcipaddr, &dev->d_ipaddr); - uiphdr_ipaddr_copy(IGMPBUF->destipaddr, destipaddr); + net_ipaddr_hdrcopy(IGMPBUF->srcipaddr, &dev->d_ipaddr); + net_ipaddr_hdrcopy(IGMPBUF->destipaddr, destipaddr); /* Calculate IP checksum. */ @@ -166,7 +166,7 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, IGMPBUF->type = group->msgid; IGMPBUF->maxresp = 0; - uiphdr_ipaddr_copy(IGMPBUF->grpaddr, &group->grpaddr); + net_ipaddr_hdrcopy(IGMPBUF->grpaddr, &group->grpaddr); /* Calculate the IGMP checksum. */ diff --git a/nuttx/net/pkt/pkt_conn.c b/nuttx/net/pkt/pkt_conn.c index 59be0e6cc..2b4bf9830 100644 --- a/nuttx/net/pkt/pkt_conn.c +++ b/nuttx/net/pkt/pkt_conn.c @@ -211,7 +211,7 @@ void pkt_free(FAR struct pkt_conn_s *conn) FAR struct pkt_conn_s *pkt_active(struct eth_hdr_s *buf) { - #define uip_ethaddr_cmp(addr1, addr2) \ + #define eth_addr_cmp(addr1, addr2) \ ((addr1[0] == addr2[0]) && (addr1[1] == addr2[1]) && \ (addr1[2] == addr2[2]) && (addr1[3] == addr2[3]) && \ (addr1[4] == addr2[4]) && (addr1[5] == addr2[5])) @@ -223,7 +223,7 @@ FAR struct pkt_conn_s *pkt_active(struct eth_hdr_s *buf) { /* FIXME lmac in conn should have been set by pkt_bind() */ - if (uip_ethaddr_cmp(buf->dest, conn->lmac)) + if (eth_addr_cmp(buf->dest, conn->lmac)) { /* Matching connection found.. return a reference to it */ diff --git a/nuttx/net/socket/recvfrom.c b/nuttx/net/socket/recvfrom.c index 1ac582004..cd1334554 100644 --- a/nuttx/net/socket/recvfrom.c +++ b/nuttx/net/socket/recvfrom.c @@ -577,7 +577,8 @@ static inline void recvfrom_tcpsender(FAR struct net_driver_s *dev, #ifdef CONFIG_NET_IPv6 net_ipaddr_copy(infrom->sin6_addr.s6_addr, TCPBUF->srcipaddr); #else - net_ipaddr_copy(infrom->sin_addr.s_addr, uip_ip4addr_conv(TCPBUF->srcipaddr)); + net_ipaddr_copy(infrom->sin_addr.s_addr, + net_ip4addr_conv32(TCPBUF->srcipaddr)); #endif } } @@ -823,7 +824,8 @@ static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_ #ifdef CONFIG_NET_IPv6 net_ipaddr_copy(infrom->sin6_addr.s6_addr, UDPBUF->srcipaddr); #else - net_ipaddr_copy(infrom->sin_addr.s_addr, uip_ip4addr_conv(UDPBUF->srcipaddr)); + net_ipaddr_copy(infrom->sin_addr.s_addr, + net_ip4addr_conv32(UDPBUF->srcipaddr)); #endif } } diff --git a/nuttx/net/tcp/tcp_conn.c b/nuttx/net/tcp/tcp_conn.c index 28c0cfc1a..362165f15 100644 --- a/nuttx/net/tcp/tcp_conn.c +++ b/nuttx/net/tcp/tcp_conn.c @@ -412,7 +412,7 @@ void tcp_free(FAR struct tcp_conn_s *conn) FAR struct tcp_conn_s *tcp_active(struct tcp_iphdr_s *buf) { FAR struct tcp_conn_s *conn = (struct tcp_conn_s *)g_active_tcp_connections.head; - in_addr_t srcipaddr = uip_ip4addr_conv(buf->srcipaddr); + in_addr_t srcipaddr = net_ip4addr_conv32(buf->srcipaddr); while (conn) { @@ -522,7 +522,7 @@ FAR struct tcp_conn_s *tcp_alloc_accept(FAR struct tcp_iphdr_s *buf) conn->lport = buf->destport; conn->rport = buf->srcport; conn->mss = UIP_TCP_INITIAL_MSS; - net_ipaddr_copy(conn->ripaddr, uip_ip4addr_conv(buf->srcipaddr)); + net_ipaddr_copy(conn->ripaddr, net_ip4addr_conv32(buf->srcipaddr)); conn->tcpstateflags = UIP_SYN_RCVD; tcp_initsequence(conn->sndseq); diff --git a/nuttx/net/tcp/tcp_send.c b/nuttx/net/tcp/tcp_send.c index 265658361..d9873818e 100644 --- a/nuttx/net/tcp/tcp_send.c +++ b/nuttx/net/tcp/tcp_send.c @@ -185,8 +185,8 @@ static void tcp_sendcommon(FAR struct net_driver_s *dev, pbuf->srcport = conn->lport; pbuf->destport = conn->rport; - uiphdr_ipaddr_copy(pbuf->srcipaddr, &dev->d_ipaddr); - uiphdr_ipaddr_copy(pbuf->destipaddr, &conn->ripaddr); + net_ipaddr_hdrcopy(pbuf->srcipaddr, &dev->d_ipaddr); + net_ipaddr_hdrcopy(pbuf->destipaddr, &conn->ripaddr); if (conn->tcpstateflags & UIP_STOPPED) { @@ -318,8 +318,8 @@ void tcp_reset(FAR struct net_driver_s *dev) /* Swap IP addresses. */ - uiphdr_ipaddr_copy(pbuf->destipaddr, pbuf->srcipaddr); - uiphdr_ipaddr_copy(pbuf->srcipaddr, &dev->d_ipaddr); + net_ipaddr_hdrcopy(pbuf->destipaddr, pbuf->srcipaddr); + net_ipaddr_hdrcopy(pbuf->srcipaddr, &dev->d_ipaddr); /* And send out the RST packet */ diff --git a/nuttx/net/udp/udp_send.c b/nuttx/net/udp/udp_send.c index e9ca6b0c0..b3bc9a408 100644 --- a/nuttx/net/udp/udp_send.c +++ b/nuttx/net/udp/udp_send.c @@ -139,8 +139,8 @@ void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn) pudpbuf->ttl = conn->ttl; pudpbuf->proto = UIP_PROTO_UDP; - uiphdr_ipaddr_copy(pudpbuf->srcipaddr, &dev->d_ipaddr); - uiphdr_ipaddr_copy(pudpbuf->destipaddr, &conn->ripaddr); + net_ipaddr_hdrcopy(pudpbuf->srcipaddr, &dev->d_ipaddr); + net_ipaddr_hdrcopy(pudpbuf->destipaddr, &conn->ripaddr); /* Calculate IP checksum. */ |