sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/examples/thttpd: Remove the netstats demo. This depends on an illegal function call and cannot be supported. That example could be replaced with logic that uses the procfs network entries as was done for NSH which had the same issue. But I am too lazy to implement that

Browse Source
This commit is contained in:
Gregory Nutt 2017-07-01 08:03:54 -06:00
parent 75f29d9ddc
commit 9aa35b2799
9 changed files with 6 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/telnetd/Kconfig
View File

@ -6,6 +6,7 @@
config EXAMPLES_TELNETD
bool "Telnet daemon example"
default n
depends on NETUTILS_TELNETD
---help---
Enable the Telnet daemon example

11
examples/thttpd/content/Makefile.binfs
View File

@ -50,7 +50,7 @@ ROMFS_IMG = $(CONTENT_DIR)/romfs.img
ROMFS_HDR = $(CONTENT_DIR)/romfs.h
ASRCS =
CSRCS = hello.c netstat.c tasks.c
CSRCS = hello.c tasks.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))
@ -74,8 +74,8 @@ else
INSTALL_DIR = $(BIN_DIR)
endif
ROOTDEPPATH = --dep-path hello --dep-path netstat --dep-path tasks
VPATH = hello:netstat:tasks
ROOTDEPPATH = --dep-path hello --dep-path tasks
VPATH = hello:tasks
all: .built
.PHONY: context headers binaries depend clean
@ -122,13 +122,10 @@ headers: $(ROMFS_HDR)
$(BUILTIN_REGISTRY)$(DELIM)hello_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,hello,$(PRIORITY),$(STACKSIZE),hello_main)
$(BUILTIN_REGISTRY)$(DELIM)netstat_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,netstat,$(PRIORITY),$(STACKSIZE),netstat_main)
$(BUILTIN_REGISTRY)$(DELIM)tasks_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,tasks,$(PRIORITY),$(STACKSIZE),tasks_main)
context: $(BUILTIN_REGISTRY)$(DELIM)hello_main.bdat $(BUILTIN_REGISTRY)$(DELIM)netstat_main.bdat $(BUILTIN_REGISTRY)$(DELIM)tasks_main.bdat
context: $(BUILTIN_REGISTRY)$(DELIM)hello_main.bdat $(BUILTIN_REGISTRY)$(DELIM)tasks_main.bdat
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep

2
examples/thttpd/content/Makefile.nxflat
View File

@ -33,7 +33,7 @@
#
############################################################################
SUBDIRS = hello tasks netstat
SUBDIRS = hello tasks
INSTALL_FILES = index.html style.css
THTTPD_DIR = $(APPDIR)/examples/thttpd

1
examples/thttpd/content/hello/hello.c
View File

@ -69,7 +69,6 @@ int main(int argc, char *argv[])
"<div class=\"menubox\"><a href=\"/index.html\">Front page</a></div>\r\n"
"<div class=\"menubox\"><a href=\"hello\">Say Hello</a></div>\r\n"
"<div class=\"menubox\"><a href=\"tasks\">Tasks</a></div>\r\n"
"<div class=\"menubox\"><a href=\"netstat\">Network status</a></div>\r\n"
"<br>\r\n"
"</div>\r\n"
"<div class=\"contentblock\">\r\n");

1
examples/thttpd/content/index.html
View File

@ -10,7 +10,6 @@
<div class="menubox"><a href="index.html">Front page</a></div>
<div class="menubox"><a href="cgi-bin/hello">Say Hello</a></div>
<div class="menubox"><a href="cgi-bin/tasks">Tasks</a></div>
<div class="menubox"><a href="cgi-bin/netstat">Network status</a></div>
<br>
</div>

5
examples/thttpd/content/netstat/.gitignore vendored
View File

@ -1,5 +0,0 @@
netstat
*.r1
*.r2
*-thunk.S

82
examples/thttpd/content/netstat/Makefile
View File

@ -1,82 +0,0 @@
############################################################################
# examples/thttpd/content/netstat/Makefile
#
# Copyright (C) 2009, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# 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.
#
############################################################################
-include $(TOPDIR)/Make.defs
BIN = netstat
R1SRCS = $(BIN).c
R1OBJS = $(R1SRCS:.c=.o)
R2SRC = $(BIN)-thunk.S
R2OBJ = $(R2SRC:.S=.o)
all: $(BIN)
.PHONY: clean install
$(R1OBJS): %.o: %.c
@echo "CC: $<"
$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
$(R2OBJ): %.o: %.S
@echo "AS: $<"
$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
$(BIN).r1: $(R1OBJS)
@echo "LD: $<"
$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
$(R2SRC): $(BIN).r1
@echo "MK: $<"
$(Q) $(MKNXFLAT) -o $@ $^
$(BIN).r2: $(R2OBJ)
@echo "LD: $<"
$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
$(BIN): $(BIN).r2
@echo "LD: $<"
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
clean:
$(call DELFILE, $(BIN))
$(call DELFILE, $(R2SRC))
$(call DELFILE, *.r1)
$(call DELFILE, *.r2)
$(call CLEAN)
install:
$(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)

140
examples/thttpd/content/netstat/netstat.c
View File

@ -1,140 +0,0 @@
/****************************************************************************
* examples/thttpd/netstat/netstat.c
*
* Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <netinet/in.h>
#include <netinet/ether.h>
#include <nuttx/net/netconfig.h>
#include <nuttx/net/netdev.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/* NOTEs:
*
* 1. One limitation in the use of NXFLAT is that functions that are
* referenced as a pointer-to-a-function must have global scope. Otherwise
* ARM GCC will generate some bad logic.
* 2. In general, when called back, there is no guarantee to that PIC registers
* will be valid and, unless you take special precautions, it could be
* dangerous to reference global variables in the callback function.
*/
/* static */ int netdev_callback(FAR struct net_driver_s *dev, void *arg)
{
struct in_addr addr;
printf(" <dt>%s\r\n", dev->d_ifname);
#ifdef CONFIG_NET_ETHERNET
printf(" <dd>HWaddr: %s<br>\r\n", ether_ntoa(&dev->d_mac));
#endif
addr.s_addr = dev->d_ipaddr;
printf(" IPaddr: %s<br>\r\n", inet_ntoa(addr));
addr.s_addr = dev->d_draddr;
printf(" DRaddr: %s<br>\r\n", inet_ntoa(addr));
addr.s_addr = dev->d_netmask;
printf(" Mask: %s\r\n", inet_ntoa(addr));
return OK;
}
/****************************************************************************
* Public Functions
****************************************************************************/
#ifdef CONFIG_THTTPD_BINFS
int netstat_main(int argc, char *argv[])
#else
int main(int argc, char *argv[])
#endif
{
puts(
"Content-type: text/html\r\n"
"Status: 200/html\r\n"
"\r\n"
"<html>\r\n"
"<head>\r\n"
"<title>Network Status</title>\r\n"
"<link rel=\"stylesheet\" type=\"text/css\" href=\"/style.css\">\r\n"
"</head>\r\n"
"<body bgcolor=\"#fffeec\" text=\"black\">\r\n"
"<div class=\"menu\">\r\n"
"<div class=\"menubox\"><a href=\"/index.html\">Front page</a></div>\r\n"
"<div class=\"menubox\"><a href=\"hello\">Say Hello</a></div>\r\n"
"<div class=\"menubox\"><a href=\"tasks\">Tasks</a></div>\r\n"
"<div class=\"menubox\"><a href=\"netstat\">Network status</a></div>\r\n"
"<br>\r\n"
"</div>\r\n"
"<div class=\"contentblock\">\r\n"
"<dl>\r\n");
netdev_foreach(netdev_callback, NULL);
puts(
"</dl>\r\n"
"</body>\r\n"
"</html>\r\n");
return 0;
}

1
examples/thttpd/content/tasks/tasks.c
View File

@ -194,7 +194,6 @@ int main(int argc, char *argv[])
"<div class=\"menubox\"><a href=\"/index.html\">Front page</a></div>\r\n"
"<div class=\"menubox\"><a href=\"hello\">Say Hello</a></div>\r\n"
"<div class=\"menubox\"><a href=\"tasks\">Tasks</a></div>\r\n"
"<div class=\"menubox\"><a href=\"netstat\">Network status</a></div>\r\n"
"<br>\r\n"
"</div>\r\n"
"<div class=\"contentblock\">\r\n"