Correct some issues with IP/MAC address handling

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@355 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 93 insertions, 28 deletions

diff --git a/nuttx/include/net/uip/uip-lib.h b/nuttx/include/net/uip/uip-lib.h
new file mode 100644
index 000000000..3f6c9860d
--- /dev/null
+++ b/nuttx/include/net/uip/uip-lib.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+ * net/uip/uiplib.h
+ * Various uIP library functions.
+ *
+ *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Based on uIP which also has a BSD style license:
+ *
+ *   Author: Adam Dunkels <adam@sics.se>
+ *   Copyright (c) 2002, Adam Dunkels.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials provided
+ *    with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __UIPLIB_H__
+#define __UIPLIB_H__
+
+#include <nuttx/config.h>
+#include <netinet/in.h>
+
+/* Convert a textual representation of an IP address to a numerical representation.
+ *
+ * This function takes a textual representation of an IP address in
+ * the form a.b.c.d and converts it into a 4-byte array that can be
+ * used by other uIP functions.
+ *
+ * addrstr A pointer to a string containing the IP address in
+ * textual form.
+ *
+ * addr A pointer to a 4-byte array that will be filled in with
+ * the numerical representation of the address.
+ *
+ * Return: 0 If the IP address could not be parsed.
+ * Return: Non-zero If the IP address was parsed.
+ */
+
+extern unsigned char uiplib_ipaddrconv(char *addrstr, unsigned char *addr);
+
+/* Get and set IP/MAC addresses */
+
+extern int uip_setmacaddr(const char *ifname, const uint8 *macaddr);
+extern int uip_getmacaddr(const char *ifname, uint8 *macaddr);
+
+#ifdef CONFIG_NET_IPv6
+extern int uip_gethostaddr(const char *ifname, struct in6_addr *addr);
+extern int uip_sethostaddr(const char *ifname, const struct in6_addr *addr);
+extern int uip_setdraddr(const char *ifname, const struct in6_addr *addr);
+extern int uip_setnetmask(const char *ifname, const struct in6_addr *addr);
+#else
+extern int uip_gethostaddr(const char *ifname, struct in_addr *addr);
+extern int uip_sethostaddr(const char *ifname, const struct in_addr *addr);
+extern int uip_setdraddr(const char *ifname, const struct in_addr *addr);
+extern int uip_setnetmask(const char *ifname, const struct in_addr *addr);
+#endif
+
+#endif /* __UIPLIB_H__ */
diff --git a/nuttx/include/net/uip/uip.h b/nuttx/include/net/uip/uip.h
index fae05836c..dfc0bf337 100644
--- a/nuttx/include/net/uip/uip.h
+++ b/nuttx/include/net/uip/uip.h
@@ -889,10 +889,9 @@ extern void uip_udpdisable(struct uip_udp_conn *conn);
  */
 
 #ifndef CONFIG_NET_IPv6
-#define uip_ipaddr_cmp(addr1, addr2) (((uint16 *)addr1)[0] == ((uint16 *)addr2)[0] && \
-				      ((uint16 *)addr1)[1] == ((uint16 *)addr2)[1])
+# define uip_ipaddr_cmp(addr1, addr2) (addr1 == addr2)
 #else /* !CONFIG_NET_IPv6 */
-#define uip_ipaddr_cmp(addr1, addr2) (memcmp(addr1, addr2, sizeof(uip_ip6addr_t)) == 0)
+# define uip_ipaddr_cmp(addr1, addr2) (memcmp(&addr1, &addr2, sizeof(uip_ip6addr_t)) == 0)
 #endif /* !CONFIG_NET_IPv6 */
 
 /* Compare two IP addresses with netmasks
@@ -1013,4 +1012,12 @@ extern void uip_udpdisable(struct uip_udp_conn *conn);
 
 #define uip_ipaddr4(addr) (htons(((uint16 *)(addr))[1]) & 0xff)
 
+/* Print out a uIP log message.
+ *
+ * This function must be implemented by the module that uses uIP, and
+ * is called by uIP whenever a log message is generated.
+ */
+
+extern void uip_log(char *msg);
+
 #endif /* __NET_UIP_UIP_H */
diff --git a/nuttx/include/net/uip/uipopt.h b/nuttx/include/net/uip/uipopt.h
index 3123a7135..085ce6439 100644
--- a/nuttx/include/net/uip/uipopt.h
+++ b/nuttx/include/net/uip/uipopt.h
@@ -271,19 +271,6 @@
 # define UIP_STATISTICS CONFIG_NET_STATISTICS
 #endif /* CONFIG_NET_STATISTICS */
 
-/* Determines if logging of certain events should be compiled in.
- *
- * This is useful mostly for debugging. The function uip_log()
- * must be implemented to suit the architecture of the project, if
- * logging is turned on.
- */
-
-#ifndef CONFIG_NET_LOGGING
-# define UIP_LOGGING     0
-#else /* CONFIG_NET_LOGGING */
-# define UIP_LOGGING     CONFIG_NET_LOGGING
-#endif /* CONFIG_NET_LOGGING */
-
 /* Broadcast support.
  *
  * This flag configures IP broadcast support. This is useful only
@@ -345,16 +332,4 @@
 
 typedef uint16 uip_stats_t;
 
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/* Print out a uIP log message.
- *
- * This function must be implemented by the module that uses uIP, and
- * is called by uIP whenever a log message is generated.
- */
-
-void uip_log(char *msg);
-
 #endif /* __UIPOPT_H__ */