Networking: Replace all references to the macros net_ipaddr_copy, net_ipaddr_hdrcopy, net_ipaddr_cmp, net_ipaddr_hdrcmp, and net_ipaddr_maskcmp with the appropriate IPv4 or IPv6 version of the macro (such as net_ipv4addr_copy). The goal is to support both IPv4 and IPv6 simultaneously. This requires that the macros be distinct and not conditionally defined to one on or the other.

1 files changed, 4 insertions, 4 deletions

diff --git a/nuttx/net/udp/udp_send.c b/nuttx/net/udp/udp_send.c
index 4455813f0..8ceff0710 100644
--- a/nuttx/net/udp/udp_send.c
+++ b/nuttx/net/udp/udp_send.c
@@ -125,8 +125,8 @@ void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn)
       pudpbuf->proto       = IP_PROTO_UDP;
       pudpbuf->ttl         = conn->ttl;
 
-      net_ipaddr_copy(pudpbuf->srcipaddr, &dev->d_ipaddr);
-      net_ipaddr_copy(pudpbuf->destipaddr, &conn->u.ipv4.raddr);
+      net_ipv6addr_copy(pudpbuf->srcipaddr, &dev->d_ipaddr);
+      net_ipav6ddr_copy(pudpbuf->destipaddr, &conn->u.ipv4.raddr);
 
 #else /* CONFIG_NET_IPv6 */
 
@@ -142,8 +142,8 @@ void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn)
       pudpbuf->ttl         = conn->ttl;
       pudpbuf->proto       = IP_PROTO_UDP;
 
-      net_ipaddr_hdrcopy(pudpbuf->srcipaddr, &dev->d_ipaddr);
-      net_ipaddr_hdrcopy(pudpbuf->destipaddr, &conn->u.ipv4.raddr);
+      net_ipv4addr_hdrcopy(pudpbuf->srcipaddr, &dev->d_ipaddr);
+      net_ipv4addr_hdrcopy(pudpbuf->destipaddr, &conn->u.ipv4.raddr);
 
       /* Calculate IP checksum. */