diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-06-22 19:55:25 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-06-22 19:55:25 +0000 |
| commit | 07e668408ffc540616fce35f475ecfeb0633f7e0 (patch) | |
| tree | af29cd3ab8391eb4ecd06855e3c0b7cd567f3fec | |
| parent | 2007-06-22 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | network-demos-07e668408ffc540616fce35f475ecfeb0633f7e0.tar.bz2 | |
2007-06-22 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile: Remove netlink. It appeared to be a hacked copy of http.
* netlink/ChangeLog, netlink/Makefile, netlink/index.html,
netlink/init.c, netlink/networkconfig.h, netlink/system.h: Removed.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | netlink/ChangeLog | 24 | ||||
| -rw-r--r-- | netlink/Makefile | 66 | ||||
| -rw-r--r-- | netlink/index.html | 15 | ||||
| -rw-r--r-- | netlink/init.c | 113 | ||||
| -rw-r--r-- | netlink/networkconfig.h | 116 | ||||
| -rw-r--r-- | netlink/system.h | 33 |
8 files changed, 7 insertions, 368 deletions
@@ -1,3 +1,9 @@ +2007-06-22 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile: Remove netlink. It appeared to be a hacked copy of http. + * netlink/ChangeLog, netlink/Makefile, netlink/index.html, + netlink/init.c, netlink/networkconfig.h, netlink/system.h: Removed. + 2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> * Makefile: New file. @@ -4,7 +4,7 @@ include $(RTEMS_MAKEFILE_PATH)/Makefile.inc -SUBDIRS= netdemo netlink http dnstest ntp select tftpTest ttcp +SUBDIRS= netdemo http dnstest ntp select tftpTest ttcp # This requires something that is optional and we need to test for it #SUBDIRS+= rpc_demo diff --git a/netlink/ChangeLog b/netlink/ChangeLog deleted file mode 100644 index 76ef83b..0000000 --- a/netlink/ChangeLog +++ /dev/null @@ -1,24 +0,0 @@ -2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> - - * init.c: More warnings removed. - -2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> - - * Makefile, init.c: Now compiles reasonably cleanly with CVS head. - -2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> - - * init.c, system.h: confdefs.h should be rtems/confdefs.h - -2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> - - * init.c: Replace CONFIGURE_TEST_XXX with CONFIGURE_APPLICATION_XXX. - -2003-01-28 Joel Sherrill <joel@OARcorp.com> - - * init.c: Increase number of file descriptors and use IMFS instead of - mini-IMFS as filesystem. - -2000-12-14 Joel Sherrill <joel@OARcorp.com> - - * ChangeLog: New file. diff --git a/netlink/Makefile b/netlink/Makefile deleted file mode 100644 index 9245081..0000000 --- a/netlink/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# $Id$ -# - -SAMPLE=netlink -PGM=${ARCH}/$(SAMPLE).exe - -MANAGERS=all - -# C source names, if any, go here -- minus the .c -C_PIECES=init -C_FILES=$(C_PIECES:%=%.c) -C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) - -H_FILES= - -DOCTYPES= -DOCS=$(DOCTYPES:%=$(SAMPLE).%) - -SRCS=$(DOCS) $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) # $(ARCH)/tarfile.o - -PRINT_SRCS=$(DOCS) - -PGM=${ARCH}/$(SAMPLE).exe - -include $(RTEMS_MAKEFILE_PATH)/Makefile.inc -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += -# CFLAGS_LD += -Wl,--defsym -Wl,HeapSize=0xC0000 -CFLAGS_OPTIMIZE_V += -CFLAGS_DEBUG_V += -v -qrtems_debug - -LD_PATHS += -LD_LIBS += -lhttpd - -# -# Add your list of files to delete here. The config files -# already know how to delete some stuff, so you may want -# to just run 'make clean' first to see what gets missed. -# 'make clobber' already includes 'make clean' -# - -CLEAN_ADDITIONS += tarfile -CLOBBER_ADDITIONS += - -all: ${ARCH} $(SRCS) $(PGM) - -${PGM}: $(OBJS) $(LINK_FILES) - $(make-exe) - -#$(ARCH)/tarfile.o: -# tar cf tarfile index.html -# $(LD) -r -o $(ARCH)/tarfile.o -b binary tarfile - -# Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL) -install: all diff --git a/netlink/index.html b/netlink/index.html deleted file mode 100644 index 15e5c9f..0000000 --- a/netlink/index.html +++ /dev/null @@ -1,15 +0,0 @@ -<HTML> -<HEAD><TITLE>RTEMS GoAhead Test Page</TITLE></HEAD> -<BODY BGCOLOR="FFFFFF"> -<A HREF="http://www.oarcorp.com" target="Text Frame"> - <IMG align=right BORDER=0 SRC="oaronly.jpg" ALT="OAR"> </A> -<H1>RTEMS GoAhead Test Page</H1> -<HR> -<BODY> - -<P>Congratulations, you have successfully loaded your first page -from the GoAhead Web Server running on RTEMS.</P> - -<HR> -Copyright © 1988-1999 <A HREF="http://www.oarcorp.com" target="Text Frame">OAR Corporation</A> -</BODY></HTML> diff --git a/netlink/init.c b/netlink/init.c deleted file mode 100644 index ca4fb25..0000000 --- a/netlink/init.c +++ /dev/null @@ -1,113 +0,0 @@ -/* Init - * - * This routine is the initialization task for this test program. - * - * Don't forget to change the IP addresses - */ - -#include <bsp.h> - -#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20 -#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM - -#define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024) -#define CONFIGURE_MAXIMUM_SEMAPHORES 20 -#define CONFIGURE_MAXIMUM_TASKS 20 - -#define CONFIGURE_INIT_TASK_STACK_SIZE (10*1024) -#define CONFIGURE_INIT_TASK_PRIORITY 120 -#define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \ - RTEMS_NO_TIMESLICE | \ - RTEMS_NO_ASR | \ - RTEMS_INTERRUPT_LEVEL(0)) - -#define CONFIGURE_INIT - -rtems_task Init( - rtems_task_argument argument -); - -/* configuration information */ - -#include <rtems/confdefs.h> - -#include <errno.h> -#include <time.h> - -#include <stdio.h> -#include <rtems/rtems_bsdnet.h> -#include <rtems/ftpd.h> -#include <rtems/untar.h> - - -#include <rtems/error.h> -#include <rpc/rpc.h> -#include <netinet/in.h> -#include <time.h> - -#include <arpa/inet.h> -#include <sys/socket.h> -#include "networkconfig.h" - -#include <rtems_webserver.h> - -#define ARGUMENT 0 - -extern int _binary_tarfile_start; -extern int _binary_tarfile_size; - -struct rtems_ftpd_configuration rtems_ftpd_configuration = { - 10, /* FTPD task priority */ - 1024, /* Maximum buffersize for hooks */ - 80, /* Well-known port */ - NULL /* List of hooks */ -}; - -/* - * Settings for the Application Profiles: - * - * Base Networking Profile - neither - * FTP Server Profile - include ftpd - * Web Server Profile -include httpd - */ - -#define INCLUDE_FTPD 0 -#define INCLUDE_HTTPD 1 - -/* XXX until binutils are rebuilt */ - -int _binary_tarfile_start; -int _binary_tarfile_size; - -rtems_task Init( - rtems_task_argument argument -) -{ - rtems_status_code status; - - rtems_bsdnet_initialize_network (); - -#if INCLUDE_FTPD - status = Untar_FromMemory((void *)(&_binary_tarfile_start), - (size_t)&_binary_tarfile_size); - rtems_initialize_ftpd(); - -#endif - -#if INCLUDE_HTTPD - status = Untar_FromMemory((void *)(&_binary_tarfile_start), - (size_t)&_binary_tarfile_size); - rtems_initialize_webserver(); -#endif - -#if 0 - status = rtems_task_delete( RTEMS_SELF ); -#endif -} - - - - diff --git a/netlink/networkconfig.h b/netlink/networkconfig.h deleted file mode 100644 index 1cf9e56..0000000 --- a/netlink/networkconfig.h +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Network configuration - * - ************************************************************ - * EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION * - * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! * - ************************************************************ - * - * $Id$ - */ - -#ifndef _RTEMS_NETWORKCONFIG_H_ -#define _RTEMS_NETWORKCONFIG_H_ - -#ifndef RTEMS_BSP_NETWORK_DRIVER_NAME -#warning "RTEMS_BSP_NETWORK_DRIVER_NAME is not defined" -#define RTEMS_BSP_NETWORK_DRIVER_NAME "no_network1" -#endif - -#ifndef RTEMS_BSP_NETWORK_DRIVER_ATTACH -#warning "RTEMS_BSP_NETWORK_DRIVER_ATTACH is not defined" -#define RTEMS_BSP_NETWORK_DRIVER_ATTACH 0 -#endif - -/* #define RTEMS_USE_BOOTP */ - -#include <bsp.h> - -/* - * Define RTEMS_SET_ETHERNET_ADDRESS if you want to specify the - * Ethernet address here. If RTEMS_SET_ETHERNET_ADDRESS is not - * defined the driver will choose an address. - */ -#define RTEMS_SET_ETHERNET_ADDRESS -#if (defined (RTEMS_SET_ETHERNET_ADDRESS)) -/* static char ethernet_address[6] = { 0x08, 0x00, 0x3e, 0x12, 0x28, 0xb1 }; */ -static char ethernet_address[6] = { 0x00, 0x80, 0x7F, 0x22, 0x61, 0x77 }; - -#endif - -/* - * Default network interface - */ -static struct rtems_bsdnet_ifconfig netdriver_config = { -#if 0 - RTEMS_BSP_NETWORK_DRIVER_NAME, /* name */ - RTEMS_BSP_NETWORK_DRIVER_ATTACH, /* attach function */ -#endif - "no driver", /* name */ - NULL, /* attach function */ - - NULL, /* link to next interface */ - -#if (defined (RTEMS_USE_BOOTP)) - NULL, /* BOOTP supplies IP address */ - NULL, /* BOOTP supplies IP net mask */ -#else - "XXX.YYY.ZZZ.XYZ", /* IP address */ - "255.255.255.0", /* IP net mask */ -#endif /* !RTEMS_USE_BOOTP */ - -#if (defined (RTEMS_SET_ETHERNET_ADDRESS)) - ethernet_address, /* Ethernet hardware address */ -#else - NULL, /* Driver supplies hardware address */ -#endif - 0 /* Use default driver parameters */ -}; - -/* - * Network configuration - */ -struct rtems_bsdnet_config rtems_bsdnet_config = { - &netdriver_config, - -#if (defined (RTEMS_USE_BOOTP)) - rtems_bsdnet_do_bootp, -#else - NULL, -#endif - - 0, /* Default network task priority */ - 0, /* Default mbuf capacity */ - 0, /* Default mbuf cluster capacity */ - -#if (!defined (RTEMS_USE_BOOTP)) - "rtems_host", /* Host name */ - "nodomain.com", /* Domain name */ - "XXX.YYY.ZZZ.1", /* Gateway */ - "XXX.YYY.ZZZ.1", /* Log host */ - {"XXX.YYY.ZZZ.1" }, /* Name server(s) */ - - /* - * A real example -- DO NOT USE THIS YOURSELF!!! - */ - -#if 0 - "dy4", /* Host name */ - "NOT_oarcorp.com", /* Domain name */ - "192.168.1.2", /* Gateway */ - "192.168.1.2", /* Log host */ - {"192.168.1.2" }, /* Name server(s) */ -#endif -#endif /* !RTEMS_USE_BOOTP */ - -}; - -/* - * For TFTP test application - */ -#if (!defined (RTEMS_USE_BOOTP)) -#define RTEMS_TFTP_TEST_HOST_NAME "XXX.YYY.ZZZ.XYZ" -#define RTEMS_TFTP_TEST_FILE_NAME "tftptest" -#endif - -#endif /* _RTEMS_NETWORKCONFIG_H_ */ diff --git a/netlink/system.h b/netlink/system.h deleted file mode 100644 index c88c0fc..0000000 --- a/netlink/system.h +++ /dev/null @@ -1,33 +0,0 @@ -/* system.h - * - * This include file contains information that is included in every - * function in the test set. - * - * COPYRIGHT (c) 1989-1998. - * On-Line Applications Research Corporation (OAR). - * Copyright assigned to U.S. Government, 1994. - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include <tmacros.h> - -/* functions */ - -rtems_task Init( - rtems_task_argument argument -); - -/* configuration information */ - -#include <rtems/confdefs.h> - -/* global variables */ - -TEST_EXTERN rtems_id Global_variable; /* example global variable */ - -/* end of include file */ |