Move netutils header files from include/net/uip to include/apps/netutils

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

11 files changed, 53 insertions, 53 deletions

diff --git a/nuttx/include/net/uip/dhcpc.h b/nuttx/include/apps/netutils/dhcpc.h
index 3d2fe4109..994a6713e 100644
--- a/nuttx/include/net/uip/dhcpc.h
+++ b/nuttx/include/apps/netutils/dhcpc.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/dhcpc.n
+ * apps/netutils/dhcpc.n
  *
- *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
@@ -35,8 +35,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __NET_UIP_DHCPC_H
-#define __NET_UIP_DHCPC_H
+#ifndef __APPS_NETUTILS_DHCPC_H
+#define __APPS_NETUTILS_DHCPC_H
 
 /****************************************************************************
  * Included Files
@@ -82,4 +82,4 @@ EXTERN void  dhcpc_close(void *handle);
 }
 #endif
 
-#endif /* __NET_UIP_DHCPC_H */
+#endif /* __APPS_NETUTILS_DHCPC_H */
diff --git a/nuttx/include/net/uip/dhcpd.h b/nuttx/include/apps/netutils/dhcpd.h
index f9aea86f3..b03415b20 100644
--- a/nuttx/include/net/uip/dhcpd.h
+++ b/nuttx/include/apps/netutils/dhcpd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uipt/dhcpd.h
+ * apps/netutils/dhcpd.h
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
@@ -35,8 +35,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __NET_UIP_DHCPD_H
-#define __NET_UIP_DHCPD_H
+#ifndef __APPS_NETUTILS_DHCPD_H
+#define __APPS_NETUTILS_DHCPD_H
 
 /****************************************************************************
  * Included Files
@@ -68,4 +68,4 @@ EXTERN int dhcpd_run(void);
 }
 #endif
 
-#endif /* __NET_UIP_DHCPD_H */
+#endif /* __APPS_NETUTILS_DHCPD_H */
diff --git a/nuttx/include/net/uip/httpd.h b/nuttx/include/apps/netutils/httpd.h
index cd850e51d..12f2a1511 100644
--- a/nuttx/include/net/uip/httpd.h
+++ b/nuttx/include/apps/netutils/httpd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/httpd.h
+ * apps/netutils/httpd.h
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based on uIP which also has a BSD style license:
@@ -37,8 +37,8 @@
  *
  ****************************************************************************/
 
-#ifndef _NET_UIP_HTTPD_H
-#define _NET_UIP_HTTPD_H
+#ifndef __APPS_NETUTILS_HTTPD_H
+#define __APPS_NETUTILS_HTTPD_H
 
 /****************************************************************************
  * Included Files
@@ -51,4 +51,4 @@
 extern void httpd_init(void);
 extern int httpd_listen(void);
 
-#endif /* _NET_UIP_HTTPD_H */
+#endif /* __APPS_NETUTILS_HTTPD_H */
diff --git a/nuttx/include/net/uip/ipmsfilter.h b/nuttx/include/apps/netutils/ipmsfilter.h
index df792d50b..56088eca7 100755
--- a/nuttx/include/net/uip/ipmsfilter.h
+++ b/nuttx/include/apps/netutils/ipmsfilter.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * net/uip/ipmsfilter.h
+ * apps/netutils/ipmsfilter.h
  * User interface to add/remove IP multicast address
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_IPMSFILTER_H
-#define __NET_UIP_IPMSFILTER_H
+#ifndef __APPS_NETUTILS_IPMSFILTER_H
+#define __APPS_NETUTILS_IPMSFILTER_H
 
 /****************************************************************************
  * Included Files
@@ -98,4 +98,4 @@ EXTERN int ipmsfilter(FAR const char *ifname,
 #endif
 
 #endif /* CONFIG_NET_IGMP */
-#endif /* __NET_UIP_IPMSFILTER_H */
+#endif /* __APPS_NETUTILS_IPMSFILTER_H */
diff --git a/nuttx/include/net/uip/resolv.h b/nuttx/include/apps/netutils/resolv.h
index 8b9f3bace..a427c5394 100644
--- a/nuttx/include/net/uip/resolv.h
+++ b/nuttx/include/apps/netutils/resolv.h
@@ -1,4 +1,4 @@
-/* resolv.h
+/* includes/apps/netutils/resolv.h
  * DNS resolver code header file.
  * Authtor Adam Dunkels <adam@dunkels.com>
  *
@@ -30,8 +30,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __UIP_RESOLV_H__
-#define __UIP_RESOLV_H__
+#ifndef __APPS_NETUTILS_RESOLVE_H
+#define __APPS_NETUTILS_RESOLVE_H
 
 #include <net/uip/uipopt.h>
 
@@ -62,4 +62,4 @@ EXTERN int  resolv_query(const char *name, struct sockaddr_in *addr);
 }
 #endif
 
-#endif /* __UIP_RESOLV_H__ */
+#endif /* __APPS_NETUTILS_RESOLVE_H */
diff --git a/nuttx/include/net/uip/smtp.h b/nuttx/include/apps/netutils/smtp.h
index 4653443ff..d1ea0c5d9 100644
--- a/nuttx/include/net/uip/smtp.h
+++ b/nuttx/include/apps/netutils/smtp.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * smtp.h
+ * include/apps/netutils/smtp.h
  * SMTP header file
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Heavily leveraged from uIP 1.0 which also has a BSD-like license:
@@ -37,8 +37,8 @@
  *
  ****************************************************************************/
 
-#ifndef __SMTP_H__
-#define __SMTP_H__
+#ifndef __APPS_NETUTILS_SMTP_H
+#define __APPS_NETUTILS_SMTP_H
 
 /****************************************************************************
  * Included Files
@@ -63,4 +63,4 @@ extern int   smtp_send(void *handle, const char *to, const char *cc,
                        const char *msg, int msglen);
 extern void  smtp_close(void *handle);
 
-#endif /* __SMTP_H__ */
+#endif /* __APPS_NETUTILS_SMTP_H */
diff --git a/nuttx/include/net/uip/telnetd.h b/nuttx/include/apps/netutils/telnetd.h
index 32247c206..9d3d6feaf 100644
--- a/nuttx/include/net/uip/telnetd.h
+++ b/nuttx/include/apps/netutils/telnetd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/net/uip/telnetd.h
+ * include/apps/netutils/telnetd.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This is a leverage of similar logic from uIP:
@@ -36,8 +36,8 @@
  * SUCH DAMAGE.
  ****************************************************************************/
 
-#ifndef __NET_UIP_TELNETD_H
-#define __NET_UIP_TELNETD_H
+#ifndef __APPS_NETUTILS_TELNETD_H
+#define __APPS_NETUTILS_TELNETD_H
 
 /****************************************************************************
  * Included Files
@@ -67,4 +67,4 @@ EXTERN void telnetd_init(void);
 }
 #endif
 
-#endif /* __NET_UIP_TELNETD_H */
+#endif /* __APPS_NETUTILS_TELNETD_H */
diff --git a/nuttx/include/net/uip/tftp.h b/nuttx/include/apps/netutils/tftp.h
index 7aa77c109..c00e37c72 100644
--- a/nuttx/include/net/uip/tftp.h
+++ b/nuttx/include/apps/netutils/tftp.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/net/uip/tftp.h
+ * include/apps/netutils/tftp.h
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_TFTP_H
-#define __NET_UIP_TFTP_H
+#ifndef __APPS_NETUTILS_TFTP_H
+#define __APPS_NETUTILS_TFTP_H
 
 /****************************************************************************
  * Included Files
@@ -70,4 +70,4 @@ EXTERN int tftpput(const char *local, const char *remote, in_addr_t addr, bool b
 }
 #endif
 
-#endif /* __NET_UIP_TFTP_H */
\ No newline at end of file
+#endif /* __APPS_NETUTILS_TFTP_H */
\ No newline at end of file
diff --git a/nuttx/include/net/uip/thttpd.h b/nuttx/include/apps/netutils/thttpd.h
index bd445766c..959177219 100644
--- a/nuttx/include/net/uip/thttpd.h
+++ b/nuttx/include/apps/netutils/thttpd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/thttpd.h
+ * apps/netutils/thttpd.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_THTTPD_H
-#define __NET_UIP_THTTPD_H
+#ifndef __APPS_NETUTILS_THTTPD_H
+#define __APPS_NETUTILS_THTTPD_H
 
 /****************************************************************************
  * Included Files
@@ -98,4 +98,4 @@ EXTERN int thttpd_main(int argc, char **argv);
 }
 #endif
 
-#endif /* __NET_UIP_THTTPD_H */
+#endif /* __APPS_NETUTILS_THTTPD_H */
diff --git a/nuttx/include/net/uip/uip-lib.h b/nuttx/include/apps/netutils/uiplib.h
index 813245953..a149de63b 100644
--- a/nuttx/include/net/uip/uip-lib.h
+++ b/nuttx/include/apps/netutils/uiplib.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uiplib.h
+ * apps/netutils/uiplib.h
  * Various non-standard APIs to support netutils.  All non-standard and
  * intended only for internal use.
  *
@@ -42,8 +42,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_UIP_LIB_H
-#define __NET_UIP_UIP_LIB_H
+#ifndef __APPS_NETUTILS_UIPLIB_H
+#define __APPS_NETUTILS_UIPLIB_H
 
 /****************************************************************************
  * Included Files
@@ -126,4 +126,4 @@ extern int  uip_parsehttpurl(const char *url, uint16_t *port,
 
 extern void uip_server(uint16_t portno, pthread_startroutine_t handler, int stacksize);
 
-#endif /* __NET_UIP_UIP_LIB_H */
+#endif /* __APPS_NETUTILS_UIPLIB_H */
diff --git a/nuttx/include/net/uip/webclient.h b/nuttx/include/apps/netutils/webclient.h
index 6e91bfb23..c80626e3b 100644
--- a/nuttx/include/net/uip/webclient.h
+++ b/nuttx/include/apps/netutils/webclient.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * include/net/uip/webclient.h
+ * include/apps/netutils/webclient.h
  * Header file for the HTTP client
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based remotely on the uIP webclient which also has a BSD style license:
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_WEBCLIENT_H
-#define __NET_UIP_WEBCLIENT_H
+#ifndef __APPS_NETUTILS_WEBCLIENT_H
+#define __APPS_NETUTILS_WEBCLIENT_H
 
 /****************************************************************************
  * Included Files
@@ -146,4 +146,4 @@ EXTERN int wget(FAR const char *url, FAR char *buffer, int buflen,
 }
 #endif
 
-#endif /* __NET_UIP_WEBCLIENT_H */
+#endif /* __APPS_NETUTILS_WEBCLIENT_H */