From 2ef29d6839ebdc5bb583279c95e598d2f9b2b583 Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon>
Date: Wed, 25 May 2011 17:22:13 +0000
Subject: [PATCH] Use conversion defines instead of casting IP addresses

---
 src/include/lwip/raw.h |  6 +++---
 src/include/lwip/udp.h | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/include/lwip/raw.h b/src/include/lwip/raw.h
index a3751f81..f0c8ed47 100644
--- a/src/include/lwip/raw.h
+++ b/src/include/lwip/raw.h
@@ -112,10 +112,10 @@ err_t            raw_send       (struct raw_pcb *pcb, struct pbuf *p);
 
 #if LWIP_IPV6
 struct raw_pcb * raw_new_ip6   (u8_t proto);
-#define          raw_bind_ip6(pcb, ip6addr) raw_bind(pcb, (ip_addr_t *)ip6addr)
-#define          raw_connect_ip6(pcb, ip6addr) raw_connect(pcb, (ip_addr_t *)ip6addr)
+#define          raw_bind_ip6(pcb, ip6addr) raw_bind(pcb, ip6_2_ip(ip6addr))
+#define          raw_connect_ip6(pcb, ip6addr) raw_connect(pcb, ip6_2_ip(ip6addr))
 #define          raw_recv_ip6(pcb, recv_ip6_fn, recv_arg) raw_recv(pcb, (raw_recv_fn)recv_ip6_fn, recv_arg)
-#define          raw_sendto_ip6(pcb, pbuf, ip6addr) raw_sendto(pcb, pbuf, (ip_addr_t *)ip6addr)
+#define          raw_sendto_ip6(pcb, pbuf, ip6addr) raw_sendto(pcb, pbuf, ip6_2_ip(ip6addr))
 #endif /* LWIP_IPV6 */
 
 /* The following functions are the lower layer interface to RAW. */
diff --git a/src/include/lwip/udp.h b/src/include/lwip/udp.h
index 68b7b4e1..648c9a46 100644
--- a/src/include/lwip/udp.h
+++ b/src/include/lwip/udp.h
@@ -183,20 +183,20 @@ void             udp_input      (struct pbuf *p, struct netif *inp);
 #if LWIP_IPV6
 struct udp_pcb * udp_new_ip6(void);
 #define          udp_bind_ip6(pcb, ip6addr, port) \
-                   udp_bind(pcb, (ip_addr_t *)ip6addr, port)
+                   udp_bind(pcb, ip6_2_ip(ip6addr), port)
 #define          udp_connect_ip6(pcb, ip6addr, port) \
-                   udp_connect(pcb, (ip_addr_t *)ip6addr, port)
+                   udp_connect(pcb, ip6_2_ip(ip6addr), port)
 #define          udp_recv_ip6(pcb, recv_ip6_fn, recv_arg) \
                    udp_recv(pcb, (udp_recv_fn)recv_ip6_fn, recv_arg)
 #define          udp_sendto_ip6(pcb, pbuf, ip6addr, port) \
-                   udp_sendto(pcb, pbuf, (ip_addr_t *)ip6addr, port)
+                   udp_sendto(pcb, pbuf, ip6_2_ip(ip6addr), port)
 #define          udp_sendto_if_ip6(pcb, pbuf, ip6addr, port, netif) \
-                   udp_sendto_if(pcb, pbuf, (ip_addr_t *)ip6addr, port, netif)
+                   udp_sendto_if(pcb, pbuf, ip6_2_ip(ip6addr), port, netif)
 #if LWIP_CHECKSUM_ON_COPY
 #define          udp_sendto_chksum_ip6(pcb, pbuf, ip6addr, port, have_chk, chksum) \
-                   udp_sendto_chksum(pcb, pbuf, (ip_addr_t *)ip6addr, port, have_chk, chksum)
+                   udp_sendto_chksum(pcb, pbuf, ip6_2_ip(ip6addr), port, have_chk, chksum)
 #define          udp_sendto_if_chksum_ip6(pcb, pbuf, ip6addr, port, netif, have_chk, chksum) \
-                   udp_sendto_if_chksum(pcb, pbuf, (ip_addr_t *)ip6addr, port, netif, have_chk, chksum)
+                   udp_sendto_if_chksum(pcb, pbuf, ip6_2_ip(ip6addr), port, netif, have_chk, chksum)
 #endif /*LWIP_CHECKSUM_ON_COPY */
 #endif /* LWIP_IPV6 */