Add libhttpd.c
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1978 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
parent
49a834785b
commit
93e34db926
@ -42,7 +42,7 @@ SUBDIRS = cgi-src
|
||||
ASRCS =
|
||||
AOBJS = $(ASRCS:.S=$(OBJEXT))
|
||||
|
||||
CSRCS = thttpd.c
|
||||
CSRCS = thttpd.c libhttpd.c
|
||||
COBJS = $(CSRCS:.c=$(OBJEXT))
|
||||
|
||||
SRCS = $(ASRCS) $(CSRCS)
|
||||
|
||||
194
netutils/thttpd/config.h
Normal file
194
netutils/thttpd/config.h
Normal file
@ -0,0 +1,194 @@
|
||||
/****************************************************************************
|
||||
* netutils/thttpd/config.h
|
||||
*
|
||||
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* 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. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "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
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS 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 __NETUTILS_THTTPD_VERSION_H
|
||||
#define __NETUTILS_THTTPD_VERSION_H
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* Make sure that the system is configured to handle THTTPD */
|
||||
|
||||
#undef CONFIG_THTTPD
|
||||
#if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCPBACKLOG)
|
||||
# define CONFIG_THTTPD
|
||||
#else
|
||||
# warning "THTTPD not built because dependenciesnot selected in configuration"
|
||||
#endif
|
||||
|
||||
#if !defined(CONFIG_NET_NTCP_READAHEAD_BUFFERS) || CONFIG_NET_NTCP_READAHEAD_BUFFERS < 1
|
||||
# warning "CONFIG_NET_NTCP_READAHEAD_BUFFERS > 0 is recommended"
|
||||
#endif
|
||||
|
||||
/* Check all THTTPD configuration settings. Complain on any that should have
|
||||
* been defined but were not. Supply some kind of reasonable value for all
|
||||
* undefined settings.
|
||||
*/
|
||||
|
||||
/* Server port number */
|
||||
|
||||
#ifndef CONFIG_THTTPD_PORT
|
||||
# define CONFIG_THTTPD_PORT 80
|
||||
#endif
|
||||
|
||||
/* Server IP address (no host name) */
|
||||
|
||||
#ifndef CONFIG_THTTPD_IPADDR
|
||||
# warning "CONFIG_THTTPD_IPADDR not defined"
|
||||
# define CONFIG_THTTPD_IPADDR (10<<24|0<<16|0<<8|2)
|
||||
#endif
|
||||
|
||||
/* SERVER_ADDRESS: response */
|
||||
|
||||
#ifndef CONFIG_THTTPD_SERVER_ADDRESS
|
||||
# define CONFIG_THTTPD_SERVER_ADDRESS "http://www.nuttx.org"
|
||||
#endif
|
||||
|
||||
/* SERVER_SOFTWARE: response */
|
||||
|
||||
#ifndef CONFIG_THTTPD_SERVER_SOFTWARE
|
||||
# define CONFIG_THTTPD_SERVER_SOFTWARE "thttpd/2.25b 29dec2003-NuttX"
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_THTTPD_CGI_PATH
|
||||
# warning "CONFIG_THTTPD_CGI_PATH not defined"
|
||||
# define CONFIG_THTTPD_CGI_PATH "/mnt/www/cgi-bin"
|
||||
#endif
|
||||
|
||||
/* Only CGI programs matching this pattern will be executed. In fact,
|
||||
* if this value is not defined then no CGI logic will be built.
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_THTTPD_CGI_PATTERN
|
||||
# define CONFIG_THTTPD_CGI_PATTERN "/cgi-bin/*"
|
||||
#endif
|
||||
|
||||
/* Byte output limit for CGI tasks */
|
||||
|
||||
#ifndef CONFIG_THTTPD_CGI_BYTECOUNT
|
||||
# define CONFIG_THTTPD_CGI_BYTECOUNT 200000
|
||||
#endif
|
||||
|
||||
/* How many seconds to allow CGI programs to run before killing them. */
|
||||
|
||||
#ifndef CONFIG_THTTPD_CGI_TIMELIMIT
|
||||
# define CONFIG_THTTPD_CGI_TIMELIMIT 0 /* No time limit */
|
||||
#endif
|
||||
|
||||
/* The default character set name to use with text MIME types. */
|
||||
|
||||
#ifndef CONFIG_THTTPD_CHARSET
|
||||
# define CONFIG_THTTPD_CHARSET "iso-8859-1"
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_THTTPD_IOBUFFERSIZE
|
||||
# define CONFIG_THTTPD_IOBUFFERSIZE 256
|
||||
#endif
|
||||
|
||||
#if CONFIG_THTTPD_IOBUFFERSIZE > 65535
|
||||
# error "Can't use uint16 for buffer"
|
||||
#endif
|
||||
|
||||
/* A list of index filenames to check. The files are searched for in this order. */
|
||||
|
||||
#ifndef CONFIG_THTTPD_INDEX_NAMES
|
||||
# define CONFIG_THTTPD_INDEX_NAMES "index.html", "index.htm", "index.cgi"
|
||||
#endif
|
||||
|
||||
/* CONFIG_AUTH_FILE - The file to use for authentication. If this is defined then
|
||||
* thttpd checks for this file in the local directory before every fetch. If the
|
||||
* file exists then authentication is done, otherwise the fetch proceeds as usual.
|
||||
* If you leave this undefined then thttpd will not implement authentication at
|
||||
* all and will not check for auth files, which saves a bit of CPU time.
|
||||
* A typical value is ".htpasswd"
|
||||
*/
|
||||
|
||||
/* The listen() backlog queue length. */
|
||||
|
||||
#ifndef CONFIG_THTTPD_LISTEN_BACKLOG
|
||||
# define CONFIG_THTTPD_LISTEN_BACKLOG 8
|
||||
#endif
|
||||
|
||||
/* How many milliseconds to leave a connection open while doing a lingering close */
|
||||
|
||||
#ifndef CONFIG_THTTPD_LINGER_MSEC
|
||||
# define CONFIG_THTTPD_LINGER_MSEC 500
|
||||
#endif
|
||||
|
||||
/* How often to run the occasional cleanup job.*/
|
||||
|
||||
#ifndef CONFIG_THTTPD_OCCASIONAL_MSEC
|
||||
# define CONFIG_THTTPD_OCCASIONAL_MSEC 120 /* Two minutes */
|
||||
#endif
|
||||
|
||||
/* How many seconds to allow for reading the initial request on a new connection. */
|
||||
|
||||
#ifndef CONFIG_THTTPD_IDLE_READ_LIMIT_SEC
|
||||
# define CONFIG_THTTPD_IDLE_READ_LIMIT_SEC 300
|
||||
#endif
|
||||
|
||||
/* How many seconds before an idle connection gets closed. */
|
||||
|
||||
#ifndef CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC
|
||||
# define CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC 300
|
||||
#endif
|
||||
|
||||
/* Tilde mapping. Many URLs use ~username to indicate a user's home directory. thttpd
|
||||
* provides two options for mapping this construct to an actual filename.
|
||||
*
|
||||
* 1) Map ~username to <prefix>/username. This is the recommended choice. Each user
|
||||
* gets a subdirectory in the main web tree, and the tilde construct points there.
|
||||
* The prefix could be something like "users", or it could be empty.
|
||||
* 2) Map ~username to <user's homedir>/<postfix>. The postfix would be the name of
|
||||
* a subdirectory off of the user's actual home dir, something like "public_html".
|
||||
*
|
||||
* You can also leave both options undefined, and thttpd will not do anything special
|
||||
* about tildes. Enabling both options is an error.
|
||||
*
|
||||
* Typical values, if they're defined, are "users" for TILDE_MAP_1 and "public_html"
|
||||
* for TILDE_MAP_2.
|
||||
*/
|
||||
|
||||
#if defined(TILDE_MAP_1) && defined(TILDE_MAP_2)
|
||||
# error "Both TILDE_MAP_1 and TILDE_MAP_2 are defined"
|
||||
#endif
|
||||
|
||||
/* If CONFIG_THTTPD_URLPATTERN is not defined, then it will be used to match and verify
|
||||
* referrers.
|
||||
*/
|
||||
|
||||
#endif /* __NETUTILS_THTTPD_VERSION_H */
|
||||
|
||||
4361
netutils/thttpd/libhttpd.c
Normal file
4361
netutils/thttpd/libhttpd.c
Normal file
File diff suppressed because it is too large
Load Diff
@ -53,22 +53,6 @@
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef CONFIG_THTTPD_PORT
|
||||
# define CONFIG_THTTPD_PORT 80
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_THTTPD_CHARSET
|
||||
# define CONFIG_THTTPD_CHARSET "iso-8859-1"
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_THTTPD_IOBUFFERSIZE
|
||||
# define CONFIG_THTTPD_IOBUFFERSIZE 256
|
||||
#endif
|
||||
|
||||
#if CONFIG_THTTPD_IOBUFFERSIZE > 65535
|
||||
# error "Can't use uint16 for buffer"
|
||||
#endif
|
||||
|
||||
/* A few convenient defines. */
|
||||
|
||||
#ifndef MAX
|
||||
@ -117,15 +101,11 @@
|
||||
|
||||
/* A multi-family sockaddr. */
|
||||
|
||||
typedef union
|
||||
{
|
||||
struct sockaddr sa;
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
struct sockaddr_in6 sa_in6;
|
||||
typedef struct sockaddr_in6 httpd_sockaddr;
|
||||
#else
|
||||
struct sockaddr_in sa_in;
|
||||
#endif /* CONFIG_NET_IPv6 */
|
||||
} httpd_sockaddr;
|
||||
typedef struct sockaddr_in httpd_sockaddr;
|
||||
#endif
|
||||
|
||||
/* A server. */
|
||||
|
||||
@ -212,11 +192,7 @@ typedef struct
|
||||
* Return (httpd_server*) 0 on error.
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_NET_IPv6
|
||||
extern httpd_server *httpd_initialize(struct sockaddr_in6 *sa, char *cwd);
|
||||
#else
|
||||
extern httpd_server *httpd_initialize(struct sockaddr_in *sa, char *cwd);
|
||||
#endif
|
||||
extern httpd_server *httpd_initialize(httpd_sockaddr *sa, char *cwd);
|
||||
|
||||
/* Call to unlisten/close socket(s) listening for new connections. */
|
||||
|
||||
|
||||
@ -54,36 +54,17 @@
|
||||
|
||||
#include <nuttx/compiler.h>
|
||||
|
||||
#include "version.h"
|
||||
#include "config.h"
|
||||
#include "fdwatch.h"
|
||||
#include "libhttpd.h"
|
||||
#include "timers.h"
|
||||
|
||||
#ifdef CONFIG_THTTPD
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef CONFIG_THTTPD_IPADDR
|
||||
# warning "CONFIG_THTTPD_IPADDR not defined"
|
||||
# define CONFIG_THTTPD_IPADDR (10<<24|0<<16|0<<8|2)
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_THTTPD_LINGER_MSEC
|
||||
# define CONFIG_THTTPD_LINGER_MSEC 5000
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_THTTPD_OCCASIONAL_MSEC
|
||||
# define CONFIG_THTTPD_OCCASIONAL_MSEC 2000
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_THTTPD_IDLE_READ_LIMIT_SEC
|
||||
# define CONFIG_THTTPD_IDLE_READ_LIMIT_SEC 5
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC
|
||||
# define CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC 5
|
||||
#endif
|
||||
|
||||
#ifndef MAXPATHLEN
|
||||
# define MAXPATHLEN 64
|
||||
#endif
|
||||
@ -944,4 +925,5 @@ int thttpd_main(int argc, char **argv)
|
||||
exit(0);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_THTTPD */
|
||||
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
/****************************************************************************
|
||||
* netutils/thttpd/version.h
|
||||
* Version definitions for THTTPD
|
||||
*
|
||||
* Based on version.h by Jef Poskanser which contained no copyright information.
|
||||
*
|
||||
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* 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. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "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
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS 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 __NETUTILS_THTTPD_VERSION_H
|
||||
#define __NETUTILS_THTTPD_VERSION_H
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
#define SERVER_SOFTWARE "thttpd/2.25b 29dec2003-NuttX"
|
||||
#define SERVER_ADDRESS "http://www.nuttx.org"
|
||||
|
||||
#endif /* __NETUTILS_THTTPD_VERSION_H */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user