From 77a211c30b2e4487bdd0a0143b14a76849acbd74 Mon Sep 17 00:00:00 2001 From: Junyeon LEE Date: Wed, 9 Aug 2017 06:32:06 -0700 Subject: [PATCH] netutils: remove unused header files Remove unused httpd, thttpd header files and remove unused code in webserver example's Makefile. Change-Id: Id2542a74a8572bbd3adae87b2473bfe790642301 Signed-off-by: Junyeon LEE --- apps/COPYING | 30 ------ apps/examples/webserver/Makefile | 4 - apps/include/netutils/httpd.h | 218 --------------------------------------- apps/include/netutils/thttpd.h | 115 --------------------- 4 files changed, 367 deletions(-) delete mode 100644 apps/include/netutils/httpd.h delete mode 100644 apps/include/netutils/thttpd.h diff --git a/apps/COPYING b/apps/COPYING index 89ccb6d..07e517f 100644 --- a/apps/COPYING +++ b/apps/COPYING @@ -80,36 +80,6 @@ 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. -THTTPD -^^^^^^ - -Derived from the original THTTPD package: - - Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer . - 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. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - cJSON ^^^^^ diff --git a/apps/examples/webserver/Makefile b/apps/examples/webserver/Makefile index 1c6a7ad..bb76057 100644 --- a/apps/examples/webserver/Makefile +++ b/apps/examples/webserver/Makefile @@ -115,9 +115,6 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -httpd_fsdata.c: httpd-fs/* - $(TOPDIR)/tools/mkfsdata.pl - ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" @@ -150,7 +147,6 @@ epend: .depend clean: $(call DELFILE, .built) - $(call DELFILE, httpd_fsdata.c) $(call CLEAN) distclean: clean diff --git a/apps/include/netutils/httpd.h b/apps/include/netutils/httpd.h deleted file mode 100644 index 874ed32..0000000 --- a/apps/include/netutils/httpd.h +++ /dev/null @@ -1,218 +0,0 @@ -/**************************************************************************** - * - * Copyright 2016 Samsung Electronics All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the License. - * - ****************************************************************************/ -/**************************************************************************** - * apps/include/netutils/httpd.h - * - * Copyright (C) 2007, 2009, 2011-2012, 2014 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Based on uIP which also has a BSD style license: - * - * Author: Adam Dunkels - * Copyright (c) 2001-2005, 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 __APPS_INCLUDE_NETUTILS_HTTPD_H -#define __APPS_INCLUDE_NETUTILS_HTTPD_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include -#include - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* As threads are created to handle each request, a stack must be allocated - * for the thread. Use a default if the user provided no stacksize. - */ - -#ifndef CONFIG_NETUTILS_HTTPDSTACKSIZE -#define CONFIG_NETUTILS_HTTPDSTACKSIZE 4096 -#endif - -#ifndef CONFIG_NETUTILS_HTTPDFSSTATS -#define CONFIG_NETUTILS_HTTPDFSSTATS -#endif - -#ifndef CONFIG_NETUTILS_HTTPDFILESTATS -#define CONFIG_NETUTILS_HTTPDFILESTATS -#endif - -#undef CONFIG_NETUTILS_HTTPDNETSTATS - -/* For efficiency reasons, the size of the IO buffer should be a multiple - * of the TCP MSS value. Also, the current design requires that the IO - * buffer be sufficiently large to contain the entire GET request. - * - * In the case where there are multiple network devices with different - * link layer protocols (CONFIG_NET_MULTILINK), each network device - * may support a different TCP MSS value. Here we arbitrarily select - * the minimum MSS for that case. - */ - -#define HTTPD_IOBUFFER_SIZE (3*MIN_TCP_MSS) - -/* This is the maximum size of a file path */ - -#ifndef CONFIG_NETUTILS_HTTPD_MAXPATH -#define CONFIG_NETUTILS_HTTPD_MAXPATH PATH_MAX -#endif - -#define HTTPD_MAX_FILENAME CONFIG_NETUTILS_HTTPD_MAXPATH - -/* Other tunable values. If you need to change these values, please create - * new configurations in apps/netutils/webserver/Kconfig - */ - -#define HTTPD_MAX_CONTENTLEN 32 -#define HTTPD_MAX_HEADERLEN 180 - -/**************************************************************************** - * Public types - ****************************************************************************/ - - -struct httpd_fs_file { - char *data; - int len; -#if defined(CONFIG_NETUTILS_HTTPD_MMAP) || defined(CONFIG_NETUTILS_HTTPD_SENDFILE) - int fd; -#endif -}; - -struct httpd_state { - char ht_buffer[HTTPD_IOBUFFER_SIZE]; /* recv() buffer */ - char ht_filename[HTTPD_MAX_FILENAME]; /* filename from GET command */ -#ifndef CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE - bool ht_keepalive; /* Connection: keep-alive */ -#endif - struct httpd_fs_file ht_file; /* Fake file data to send */ - int ht_sockfd; /* The socket descriptor from accept() */ - char *ht_scriptptr; - uint16_t ht_scriptlen; - uint16_t ht_sndlen; -}; - -struct httpd_fsdata_file { - const struct httpd_fsdata_file *next; - FAR const uint8_t *name; - FAR const uint8_t *data; - int len; -#ifdef CONFIG_NETUTILS_HTTPDFSSTATS - uint16_t count; -#endif -}; - -struct httpd_fsdata_file_noconst { - FAR struct httpd_fsdata_file *next; - FAR char *name; - FAR char *data; - int len; -#ifdef CONFIG_NETUTILS_HTTPDFSSTATS - uint16_t count; -#endif -}; - -typedef void (*httpd_cgifunction)(struct httpd_state *, char *); - -struct httpd_cgi_call { - struct httpd_cgi_call *next; - const char *name; - httpd_cgifunction function; -}; - -/* HTTPD CGI function declaration - * - * Description: - * This macro is used for declaring a HTTPD CGI function. This function is - * then added to the list of HTTPD CGI functions with the httpd_cgi_register() - * function. - - * Input Parameters: - * - * name The C variable name of the function - * str The string name of the function, used in the script file - * function A pointer to the function that implements it - */ - -#define HTTPD_CGI_CALL(name, str, function) \ -static void function(struct httpd_state *, char *); \ -static struct httpd_cgi_call name = {NULL, str, function} - -/**************************************************************************** - * Public Data - ****************************************************************************/ -#ifdef __cplusplus -#define EXTERN extern "C" -extern "C" { -#else -#define EXTERN extern -#endif - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -void httpd_init(void); -int httpd_listen(void); -void httpd_cgi_register(struct httpd_cgi_call *cgi_call); -uint16_t httpd_fs_count(char *name); - -const struct httpd_fsdata_file g_httpdfs_root[]; -const int g_httpd_numfiles; - -#undef EXTERN -#ifdef __cplusplus -} -#endif - -#endif /* __APPS_INCLUDE_NETUTILS_HTTPD_H */ diff --git a/apps/include/netutils/thttpd.h b/apps/include/netutils/thttpd.h deleted file mode 100644 index 1575e26..0000000 --- a/apps/include/netutils/thttpd.h +++ /dev/null @@ -1,115 +0,0 @@ -/**************************************************************************** - * - * Copyright 2016 Samsung Electronics All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the License. - * - ****************************************************************************/ -/**************************************************************************** - * apps/include/netutils/thttpd.h - * - * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * 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 __APPS_INCLUDE_NETUTILS_THTTPD_H -#define __APPS_INCLUDE_NETUTILS_THTTPD_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -#ifdef __cplusplus -#define EXTERN extern "C" -extern "C" { -#else -#define EXTERN extern -#endif - -/* These values must be provided by the user before the THTTPD task daemon - * is started: - * - * g_thttpdsymtab: A symbol table describing all of the symbols exported - * from the base system. These symbols are used to bind address references - * in CGI programs to TinyAra. - * g_nsymbols: The number of symbols in g_thttpdsymtab[]. - * - * (See examples/nxflat and examples/thttpd for examples of how such a symbol - * table may be created.) - */ - -EXTERN FAR const struct symtab_s *g_thttpdsymtab; -EXTERN int g_thttpdnsymbols; - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -/**************************************************************************** - * Function: thttpd_main - * - * Description: - * This function is the entrypoint into the THTTPD server. It does not - * return. It may be called, the normal mechanism for starting the server - * is: - * - * 1) Set is g_thttpdsymtab and g_thttpdnsymbols. The user is required - * to provide a symbol table to use for binding CGI programs (if CGI - * is enabled. See examples/nxflat and examples/thttpd for examples of - * how such a symbol table may be created.) - * 2) Call task_create() to start thttpd_main() - * - ****************************************************************************/ - -EXTERN int thttpd_main(int argc, char **argv); - -#undef EXTERN -#ifdef __cplusplus -} -#endif - -#endif /* __APPS_INCLUDE_NETUTILS_THTTPD_H */ -- 2.7.4