summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--c/src/libmisc/ChangeLog7
-rw-r--r--c/src/libmisc/shell/Makefile.am6
-rw-r--r--c/src/libmisc/shell/telnetd.c107
-rw-r--r--c/src/libmisc/shell/telnetd.h20
-rw-r--r--cpukit/libmisc/ChangeLog7
-rw-r--r--cpukit/libmisc/shell/Makefile.am6
6 files changed, 20 insertions, 133 deletions
diff --git a/c/src/libmisc/ChangeLog b/c/src/libmisc/ChangeLog
index 68eba4c2f5..245870fb98 100644
--- a/c/src/libmisc/ChangeLog
+++ b/c/src/libmisc/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-14 Joel Sherrill <joel@OARcorp.com>
+
+ * shell/telnetd.c, shell/telnetd.h: Moved to
+ libnetworking/rtems_servers so the network stack to address network
+ depenendency.
+ * shell/Makefile.am: Modified to reflect above.
+
2001-05-25 Joel Sherrill <joel@OARcorp.com>
* shell/cmds.c: Removed code from inappropriate source.
diff --git a/c/src/libmisc/shell/Makefile.am b/c/src/libmisc/shell/Makefile.am
index 94e5350c82..fc75a4f81c 100644
--- a/c/src/libmisc/shell/Makefile.am
+++ b/c/src/libmisc/shell/Makefile.am
@@ -9,10 +9,10 @@ include_rtemsdir = $(includedir)/rtems
LIBNAME = libshell-tmp
LIB = $(ARCH)/$(LIBNAME).a
-C_FILES = cmds.c shell.c pty.c telnetd.c
+C_FILES = cmds.c shell.c pty.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-include_rtems_HEADERS = shell.h telnetd.h
+include_rtems_HEADERS = shell.h
OBJS = $(C_O_FILES)
@@ -39,6 +39,6 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
.PRECIOUS: $(LIB)
-EXTRA_DIST = README shell.c cmds.c pty.c telnetd.c shell.h telnetd.h
+EXTRA_DIST = README shell.c cmds.c pty.c shell.h
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libmisc/shell/telnetd.c b/c/src/libmisc/shell/telnetd.c
deleted file mode 100644
index 6a643f7d25..0000000000
--- a/c/src/libmisc/shell/telnetd.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * $Id$
- */
-
-#include <rtems.h>
-#include <rtems/error.h>
-#include <rtems/shell.h>
-#include <rtems/telnetd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-/***********************************************************/
-rtems_id telnetd_task_id =0;
-rtems_unsigned32 telnetd_stack_size =16384;
-rtems_task_priority telnetd_task_priority=100;
-/***********************************************************/
-rtems_task rtems_task_telnetd(rtems_task_argument task_argument) {
- int des_socket,
- acp_socket;
- struct sockaddr_in srv;
- char * devname;
- int i=1;
- int size_adr;
- if ((des_socket=socket(PF_INET,SOCK_STREAM,0))<0) {
- perror("socket");
- rtems_task_delete(RTEMS_SELF);
- };
- setsockopt(des_socket,SOL_SOCKET,0,&i,sizeof(i));
- memset(&srv,0,sizeof(srv));
- srv.sin_family=AF_INET;
- srv.sin_port=htons(23);
- size_adr=sizeof(srv);
- if ((bind(des_socket,(struct sockaddr *)&srv,size_adr))<0) {
- perror("bind");
- close(des_socket);
- rtems_task_delete(RTEMS_SELF);
- };
- if ((listen(des_socket,5))<0) {
- perror("listen");
- close(des_socket);
- rtems_task_delete(RTEMS_SELF);
- };
- do {
- acp_socket=accept(des_socket,(struct sockaddr*)&srv,&size_adr);
- if (acp_socket<0) {
- perror("accept");
- break;
- };
- if (devname = get_pty(acp_socket) ) {
- shell_init(&devname[5],
- telnetd_stack_size,
- telnetd_task_priority,
- devname,B9600|CS8,FALSE);
- } else {
- close(acp_socket);
- };
- } while(1);
- close(des_socket);
- rtems_task_delete(RTEMS_SELF);
-}
-/***********************************************************/
-int rtems_initialize_telnetd(void) {
- rtems_status_code sc;
- if (telnetd_task_id ) return RTEMS_RESOURCE_IN_USE;
- if (telnetd_stack_size<=0 ) telnetd_stack_size =16384;
- if (telnetd_task_priority<=2) telnetd_task_priority=100;
- sc=rtems_task_create(new_rtems_name("TLND"),
- 100,RTEMS_MINIMUM_STACK_SIZE,
- RTEMS_DEFAULT_MODES,
- RTEMS_DEFAULT_ATTRIBUTES,
- &telnetd_task_id);
- if (sc!=RTEMS_SUCCESSFUL) {
- rtems_error(sc,"creating task telnetd");
- return (int)sc;
- };
- sc=rtems_task_start(telnetd_task_id,
- rtems_task_telnetd,
- (rtems_task_argument)NULL);
- if (sc!=RTEMS_SUCCESSFUL) {
- rtems_error(sc,"starting task telnetd");
- };
- return (int)sc;
-}
-/***********************************************************/
-int main_telnetd(int argc,char * argv[]) {
- rtems_status_code sc;
- if (telnetd_task_id) {
- printf("ERROR:telnetd already started\n");
- return 1;
- };
- if (argc>1) telnetd_stack_size =str2int(argv[1]);
- if (argc>2) telnetd_task_priority=str2int(argv[2]);
- sc=rtems_initialize_telnetd();
- if (sc!=RTEMS_SUCCESSFUL) return sc;
- printf("rtems_telnetd() started with stacksize=%u,priority=%d\n",
- telnetd_stack_size,telnetd_task_priority);
- return 0;
-}
-/***********************************************************/
-int register_telnetd(void) {
- shell_add_cmd("telnetd","telnet","telnetd [stacksize [tsk_priority]]",main_telnetd);
- return 0;
-}
-/***********************************************************/
diff --git a/c/src/libmisc/shell/telnetd.h b/c/src/libmisc/shell/telnetd.h
deleted file mode 100644
index fa710151bf..0000000000
--- a/c/src/libmisc/shell/telnetd.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * $Id$
- */
-
-#ifndef __TELNETD_H
-#define __TELNETD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int rtems_initialize_telnetd(void);
-int main_telnetd(int argc,char * argv[]);
-int register_telnetd(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index 68eba4c2f5..245870fb98 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-14 Joel Sherrill <joel@OARcorp.com>
+
+ * shell/telnetd.c, shell/telnetd.h: Moved to
+ libnetworking/rtems_servers so the network stack to address network
+ depenendency.
+ * shell/Makefile.am: Modified to reflect above.
+
2001-05-25 Joel Sherrill <joel@OARcorp.com>
* shell/cmds.c: Removed code from inappropriate source.
diff --git a/cpukit/libmisc/shell/Makefile.am b/cpukit/libmisc/shell/Makefile.am
index 94e5350c82..fc75a4f81c 100644
--- a/cpukit/libmisc/shell/Makefile.am
+++ b/cpukit/libmisc/shell/Makefile.am
@@ -9,10 +9,10 @@ include_rtemsdir = $(includedir)/rtems
LIBNAME = libshell-tmp
LIB = $(ARCH)/$(LIBNAME).a
-C_FILES = cmds.c shell.c pty.c telnetd.c
+C_FILES = cmds.c shell.c pty.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-include_rtems_HEADERS = shell.h telnetd.h
+include_rtems_HEADERS = shell.h
OBJS = $(C_O_FILES)
@@ -39,6 +39,6 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
.PRECIOUS: $(LIB)
-EXTRA_DIST = README shell.c cmds.c pty.c telnetd.c shell.h telnetd.h
+EXTRA_DIST = README shell.c cmds.c pty.c shell.h
include $(top_srcdir)/../../../automake/local.am
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 17:02:08 +0000