Resync new repository with old repo r5166

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

3 files changed, 22 insertions, 10 deletions

diff --git a/apps/include/netutils/httpd.h b/apps/include/netutils/httpd.h
index bcecca73b..8ba9e2f7b 100644
--- a/apps/include/netutils/httpd.h
+++ b/apps/include/netutils/httpd.h
@@ -84,9 +84,13 @@ extern "C" {
 
 #define HTTPD_IOBUFFER_SIZE (3*UIP_TCP_MSS)
 
-/* this is the maximum size of a file path */
+/* This is the maximum size of a file path */
 
+#if defined(CONFIG_NETUTILS_HTTPD_MMAP) || defined(CONFIG_NETUTILS_HTTPD_SENDFILE)
+#define HTTPD_MAX_FILENAME PATH_MAX
+#else
 #define HTTPD_MAX_FILENAME  20
+#endif
 
 /****************************************************************************
  * Public types
@@ -96,7 +100,7 @@ struct httpd_fs_file
 {
   char *data;
   int len;
-#ifdef CONFIG_NETUTILS_HTTPD_MMAP
+#if defined(CONFIG_NETUTILS_HTTPD_MMAP) || defined(CONFIG_NETUTILS_HTTPD_SENDFILE)
   int fd;
 #endif
 };
diff --git a/apps/include/netutils/resolv.h b/apps/include/netutils/resolv.h
index 81798558c..bf71e3b6e 100644
--- a/apps/include/netutils/resolv.h
+++ b/apps/include/netutils/resolv.h
@@ -3,8 +3,13 @@
  * DNS resolver code header file.
  * Author Adam Dunkels <adam@dunkels.com>
  *
- * Copyright (c) 2002-2003, Adam Dunkels.
- * All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Inspired by/based on uIP logic by Adam Dunkels:
+ *
+ *   Copyright (c) 2002-2003, Adam Dunkels.
+ *   All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,6 +46,8 @@
 
 #include <nuttx/net/uip/uipopt.h>
 
+#include <netinet/in.h>
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
@@ -58,13 +65,13 @@ extern "C" {
 EXTERN int resolv_init(void);
 
 #ifdef CONFIG_NET_IPv6
-EXTERN void resolv_conf(const struct in6_addr *dnsserver);
-EXTERN void resolv_getserver(const struct in_addr *dnsserver);
-EXTERN int  resolv_query(const char *name, struct sockaddr_in6 *addr);
+EXTERN void resolv_conf(FAR const struct in6_addr *dnsserver);
+EXTERN void resolv_getserver(FAR const struct in_addr *dnsserver);
+EXTERN int  resolv_query(FAR const char *name, FAR struct sockaddr_in6 *addr);
 #else
-EXTERN void resolv_conf(const struct in_addr *dnsserver);
-EXTERN void resolv_getserver(struct in_addr *dnsserver);
-EXTERN int  resolv_query(const char *name, struct sockaddr_in *addr);
+EXTERN void resolv_conf(FAR const struct in_addr *dnsserver);
+EXTERN void resolv_getserver(FAR struct in_addr *dnsserver);
+EXTERN int  resolv_query(FAR const char *name, FAR struct sockaddr_in *addr);
 #endif
 
 #undef EXTERN
diff --git a/apps/include/netutils/uiplib.h b/apps/include/netutils/uiplib.h
index 219a5e9cc..b99417362 100644
--- a/apps/include/netutils/uiplib.h
+++ b/apps/include/netutils/uiplib.h
@@ -132,6 +132,7 @@ EXTERN int  uip_parsehttpurl(const char *url, uint16_t *port,
 
 /* Generic server logic */
 
+EXTERN int uip_listenon(uint16_t portno);
 EXTERN void uip_server(uint16_t portno, pthread_startroutine_t handler, int stacksize);
 
 #undef EXTERN