RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2007-11-26 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* telnetd/pty.c, telnetd/telnetd.c, telnetd/telnetd.h: Style clean up.
	Now works on gen5200/icecube.
This commit is contained in:
Joel Sherrill
2007-11-26 23:10:25 +00:00
parent fa920f122d
commit edcb9827dc
4 changed files with 154 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/ChangeLog
View File

@@ -1,3 +1,8 @@
2007-11-26 Joel Sherrill <joel.sherrill@oarcorp.com>
* telnetd/pty.c, telnetd/telnetd.c, telnetd/telnetd.h: Style clean up.
Now works on gen5200/icecube.
2007-11-26 Joel Sherrill <joel.sherrill@oarcorp.com> 2007-11-26 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/printk.c, score/src/objectget.c: Fix spacing. * libcsupport/src/printk.c, score/src/objectget.c: Fix spacing.

28
cpukit/telnetd/pty.c
View File

@@ -112,15 +112,18 @@ char * telnet_get_pty(int socket)
int ndx; int ndx;
if (telnet_pty_inited) { if (telnet_pty_inited) {
#if 0
if ( rtems_telnetd_maximum_ptys < 5 ) if ( rtems_telnetd_maximum_ptys < 5 )
rtems_telnetd_maximum_ptys = 5; rtems_telnetd_maximum_ptys = 5;
telnet_ptys = malloc( rtems_telnetd_maximum_ptys * sizeof (pty_t) ); telnet_ptys = malloc( rtems_telnetd_maximum_ptys * sizeof (pty_t) );
#endif
if ( !telnet_ptys ) { if ( !telnet_ptys ) {
return NULL; return NULL;
} }
for (ndx=0;ndx<rtems_telnetd_maximum_ptys;ndx++) { for (ndx=0;ndx<rtems_telnetd_maximum_ptys;ndx++) {
if (telnet_ptys[ndx].socket<0) { if (telnet_ptys[ndx].socket<0) {
struct timeval t; struct timeval t;
/* set a long polling interval to save CPU time */ /* set a long polling interval to save CPU time */
@@ -425,23 +428,28 @@ rtems_device_driver my_pty_initialize(
void *arg void *arg
) )
{ {
int ndx; int ndx;
rtems_status_code status ; rtems_status_code status;
if ( rtems_telnetd_maximum_ptys < 5 )
rtems_telnetd_maximum_ptys = 5;
telnet_ptys = malloc( rtems_telnetd_maximum_ptys * sizeof (pty_t) );
/* /*
* Set up ptys * Set up ptys
*/ */
for (ndx=0;ndx<rtems_telnetd_maximum_ptys;ndx++) { for (ndx=0;ndx<rtems_telnetd_maximum_ptys;ndx++) {
telnet_ptys[ndx].devname=(char*)malloc(strlen("/dev/ptyXX")+1); telnet_ptys[ndx].devname = (char*)malloc(strlen("/dev/ptyXX")+1);
sprintf(telnet_ptys[ndx].devname,"/dev/pty%X",ndx); sprintf(telnet_ptys[ndx].devname,"/dev/pty%X",ndx);
telnet_ptys[ndx].ttyp=NULL; telnet_ptys[ndx].ttyp = NULL;
telnet_ptys[ndx].c_cflag=CS8|B9600; telnet_ptys[ndx].c_cflag = CS8|B9600;
telnet_ptys[ndx].socket=-1; telnet_ptys[ndx].socket = -1;
telnet_ptys[ndx].opened=FALSE; telnet_ptys[ndx].opened = FALSE;
telnet_ptys[ndx].sb_ind=0; telnet_ptys[ndx].sb_ind = 0;
telnet_ptys[ndx].width=0; telnet_ptys[ndx].width = 0;
telnet_ptys[ndx].height=0; telnet_ptys[ndx].height = 0;
} }

228
cpukit/telnetd/telnetd.c
View File

@@ -61,43 +61,50 @@ extern int telnet_pty_initialize();
extern int telnet_pty_finalize(); extern int telnet_pty_finalize();
struct shell_args { struct shell_args {
char *devname; char *devname;
void *arg; void *arg;
char peername[16]; char peername[16];
char delete_myself; char delete_myself;
}; };
typedef union uni_sa { typedef union uni_sa {
struct sockaddr_in sin; struct sockaddr_in sin;
struct sockaddr sa; struct sockaddr sa;
} uni_sa; } uni_sa;
static int sockpeername(int sock, char *buf, int bufsz); static int sockpeername(int sock, char *buf, int bufsz);
static int initialize_telnetd(); static int initialize_telnetd();
static int telnetd_askForPassword;
void * telnetd_dflt_spawn(const char *name, unsigned priority, unsigned stackSize, void (*fn)(void*), void *fnarg); void * telnetd_dflt_spawn(
const char *name,
unsigned priority,
unsigned stackSize,
void (*fn)(void*),
void *fnarg
);
/***********************************************************/ /***********************************************************/
rtems_id telnetd_task_id =0; rtems_id telnetd_task_id =0;
uint32_t telnetd_stack_size =32000; uint32_t telnetd_stack_size =32000;
rtems_task_priority telnetd_task_priority=0; rtems_task_priority telnetd_task_priority=0;
int telnetd_dont_spawn =0; int telnetd_dont_spawn =0;
void (*telnetd_shell)(char *, void*)=0; void (*telnetd_shell)(char *, void*)=0;
void *telnetd_shell_arg =0; void *telnetd_shell_arg =0;
void * (*telnetd_spawn_task)(const char *, unsigned, unsigned, void (*)(void*), void *) = telnetd_dflt_spawn; void * (*telnetd_spawn_task)(
const char *, unsigned, unsigned, void (*)(void*), void *) = telnetd_dflt_spawn;
static char *grab_a_Connection(int des_socket, uni_sa *srv, char *peername, int sz) static char *grab_a_Connection(int des_socket, uni_sa *srv, char *peername, int sz)
{ {
char *rval = 0; char *rval = 0;
#if 0 #if 0
socklen_t socklen_t size_adr = sizeof(srv->sin);
#else #else
/* 4.6 doesn't have socklen_t */ /* 4.6 doesn't have socklen_t */
uint32_t uint32_t size_adr = sizeof(srv->sin);
#endif #endif
size_adr = sizeof(srv->sin); int acp_sock;
int acp_sock;
acp_sock = accept(des_socket,&srv->sa,&size_adr); acp_sock = accept(des_socket,&srv->sa,&size_adr);
@@ -145,18 +152,16 @@ static void release_a_Connection(char *devname, char *peername, FILE **pstd, int
static int sockpeername(int sock, char *buf, int bufsz) static int sockpeername(int sock, char *buf, int bufsz)
{ {
uni_sa peer; uni_sa peer;
int rval = sock < 0;
#if 0 #if 0
socklen_t socklen_t len = sizeof(peer.sin);
#else #else
/* 4.6 doesn't have socklen_t */ /* 4.6 doesn't have socklen_t */
uint32_t uint32_t len = sizeof(peer.sin);
#endif #endif
len = sizeof(peer.sin);
int rval = sock < 0; if ( !rval )
if ( !rval)
rval = getpeername(sock, &peer.sa, &len); rval = getpeername(sock, &peer.sa, &len);
if ( !rval ) if ( !rval )
@@ -180,13 +185,13 @@ spawned_shell(void *arg);
static void static void
rtems_task_telnetd(void *task_argument) rtems_task_telnetd(void *task_argument)
{ {
int des_socket; int des_socket;
uni_sa srv; uni_sa srv;
char *devname; char *devname;
char peername[16]; char peername[16];
int i=1; int i=1;
int size_adr; int size_adr;
struct shell_args *arg; struct shell_args *arg;
if ((des_socket=socket(PF_INET,SOCK_STREAM,0))<0) { if ((des_socket=socket(PF_INET,SOCK_STREAM,0))<0) {
perror("telnetd:socket"); perror("telnetd:socket");
@@ -219,43 +224,44 @@ struct shell_args *arg;
devname = grab_a_Connection(des_socket, &srv, peername, sizeof(peername)); devname = grab_a_Connection(des_socket, &srv, peername, sizeof(peername));
if ( !devname ) { if ( !devname ) {
/* if something went wrong, sleep for some time */ /* if something went wrong, sleep for some time */
sleep(10); sleep(10);
continue; continue;
} }
if ( telnetd_dont_spawn ) { if ( telnetd_dont_spawn ) {
if ( 0 == check_passwd(peername) ) if ( !telnetd_askForPassword || (0 == check_passwd(peername)) )
telnetd_shell(devname, telnetd_shell_arg); telnetd_shell(devname, telnetd_shell_arg);
} else { } else {
arg = malloc( sizeof(*arg) ); arg = malloc( sizeof(*arg) );
arg->devname = devname; arg->devname = devname;
arg->arg = telnetd_shell_arg; arg->arg = telnetd_shell_arg;
strncpy(arg->peername, peername, sizeof(arg->peername)); strncpy(arg->peername, peername, sizeof(arg->peername));
if ( !telnetd_spawn_task(&devname[5], telnetd_task_priority, telnetd_stack_size, spawned_shell, arg) ) { if ( !telnetd_spawn_task( &devname[5], telnetd_task_priority,
telnetd_stack_size, spawned_shell, arg) ) {
FILE *dummy;
FILE *dummy; if ( telnetd_spawn_task != telnetd_dflt_spawn ) {
fprintf(stderr,"Telnetd: Unable to spawn child task\n");
}
if ( telnetd_spawn_task != telnetd_dflt_spawn ) { /* hmm - the pty driver slot can only be
fprintf(stderr,"Telnetd: Unable to spawn child task\n"); * released by opening and subsequently
* closing the PTY - this also closes
* the underlying socket. So we mock up
* a stream...
*/
if ( !(dummy=fopen(devname,"r+")) )
perror("Unable to dummy open the pty, losing a slot :-(");
release_a_Connection(devname, peername, &dummy, 1);
free(arg);
sleep(2); /* don't accept connections too fast */
} }
/* hmm - the pty driver slot can only be
* released by opening and subsequently
* closing the PTY - this also closes
* the underlying socket. So we mock up
* a stream...
*/
if ( !(dummy=fopen(devname,"r+")) )
perror("Unable to dummy open the pty, losing a slot :-(");
release_a_Connection(devname, peername, &dummy, 1);
free(arg);
sleep(2); /* don't accept connections too fast */
}
} }
} while(1); } while(1);
/* TODO: how to free the connection semaphore? But then - /* TODO: how to free the connection semaphore? But then -
* stopping the daemon is probably only needed during * stopping the daemon is probably only needed during
* development/debugging. * development/debugging.
@@ -265,13 +271,15 @@ struct shell_args *arg;
close(des_socket); close(des_socket);
telnetd_task_id=0; telnetd_task_id=0;
} }
/***********************************************************/ /***********************************************************/
static int initialize_telnetd(void) { static int initialize_telnetd(void) {
if (telnetd_task_id ) return RTEMS_RESOURCE_IN_USE; if (telnetd_task_id ) return RTEMS_RESOURCE_IN_USE;
if (telnetd_stack_size<=0 ) telnetd_stack_size =32000; if (telnetd_stack_size<=0 ) telnetd_stack_size =32000;
if ( !telnetd_spawn_task("TNTD", telnetd_task_priority, RTEMS_MINIMUM_STACK_SIZE, rtems_task_telnetd, 0) ) { if ( !telnetd_spawn_task("TNTD", telnetd_task_priority,
RTEMS_MINIMUM_STACK_SIZE, rtems_task_telnetd, 0) ) {
return -1; return -1;
} }
return 0; return 0;
@@ -283,10 +291,11 @@ int rtems_telnetd_initialize(
void *arg, void *arg,
int dontSpawn, int dontSpawn,
size_t stack, size_t stack,
rtems_task_priority priority rtems_task_priority priority,
int askForPassword
) )
{ {
rtems_status_code sc; rtems_status_code sc;
#if 0 #if 0
printf("This is rtems-telnetd (modified by Till Straumann)\n"); printf("This is rtems-telnetd (modified by Till Straumann)\n");
@@ -309,6 +318,8 @@ int rtems_telnetd_initialize(
return 1; return 1;
} }
telnetd_askForPassword = askForPassword;
if (cmd) if (cmd)
telnetd_shell = cmd; telnetd_shell = cmd;
telnetd_shell_arg = arg; telnetd_shell_arg = arg;
@@ -317,14 +328,15 @@ int rtems_telnetd_initialize(
priority = rtems_bsdnet_config.network_task_priority; priority = rtems_bsdnet_config.network_task_priority;
} }
if ( priority < 2 ) if ( priority < 2 )
priority=100; priority = 100;
telnetd_task_priority = priority; telnetd_task_priority = priority;
telnetd_dont_spawn = dontSpawn; telnetd_dont_spawn = dontSpawn;
sc=initialize_telnetd(); sc = initialize_telnetd();
if (sc!=RTEMS_SUCCESSFUL) return sc; if (sc != RTEMS_SUCCESSFUL) return sc;
printf("rtems_telnetd() started with stacksize=%u,priority=%d\n", printf("rtems_telnetd() started with stacksize=%u,priority=%d\n",
(unsigned)telnetd_stack_size,(int)telnetd_task_priority); (unsigned)telnetd_stack_size,(int)telnetd_task_priority);
return 0; return 0;
} }
@@ -332,11 +344,11 @@ int rtems_telnetd_initialize(
static void static void
spawned_shell(void *targ) spawned_shell(void *targ)
{ {
rtems_status_code sc; rtems_status_code sc;
FILE *nstd[3]={0}; FILE *nstd[3]={0};
FILE *ostd[3]={ stdin, stdout, stderr }; FILE *ostd[3]={ stdin, stdout, stderr };
int i=0; int i=0;
struct shell_args *arg = targ; struct shell_args *arg = targ;
sc=rtems_libio_set_private_env(); sc=rtems_libio_set_private_env();
@@ -365,16 +377,15 @@ struct shell_args *arg = targ;
stdout = nstd[1]; stdout = nstd[1];
stderr = nstd[2]; stderr = nstd[2];
#if 0
printk("STDOUT is now %x (%x) (FD %i/%i)\n",
#if 0 stdout,nstd[1],fileno(stdout),fileno(nstd[1]));
printk("STDOUT is now %x (%x) (FD %i/%i)\n",stdout,nstd[1],fileno(stdout),fileno(nstd[1])); printf("hello\n");
printf("hello\n"); write(fileno(stdout),"hellofd\n",8);
write(fileno(stdout),"hellofd\n",8); #endif
#endif
/* call their routine */ /* call their routine */
if ( 0 == check_passwd(arg->peername) ) if ( !telnetd_askForPassword || (0 == check_passwd(arg->peername)) )
telnetd_shell(arg->devname, arg->arg); telnetd_shell(arg->devname, arg->arg);
stdin = ostd[0]; stdin = ostd[0];
@@ -394,9 +405,9 @@ struct wrap_delete_args {
static rtems_task static rtems_task
wrap_delete(rtems_task_argument arg) wrap_delete(rtems_task_argument arg)
{ {
struct wrap_delete_args *pwa = (struct wrap_delete_args *)arg; struct wrap_delete_args *pwa = (struct wrap_delete_args *)arg;
register void (*t)(void *) = pwa->t; register void (*t)(void *) = pwa->t;
register void *a = pwa->a; register void *a = pwa->a;
/* free argument before calling function (which may never return if /* free argument before calling function (which may never return if
* they choose to delete themselves) * they choose to delete themselves)
@@ -409,42 +420,41 @@ register void *a = pwa->a;
void * void *
telnetd_dflt_spawn(const char *name, unsigned int priority, unsigned int stackSize, void (*fn)(void *), void* fnarg) telnetd_dflt_spawn(const char *name, unsigned int priority, unsigned int stackSize, void (*fn)(void *), void* fnarg)
{ {
rtems_status_code sc; rtems_status_code sc;
rtems_id task_id; rtems_id task_id;
char nm[4] = {'X','X','X','X' }; char nm[4] = {'X','X','X','X' };
struct wrap_delete_args *pwa = malloc(sizeof(*pwa)); struct wrap_delete_args *pwa = malloc(sizeof(*pwa));
strncpy(nm, name, 4); strncpy(nm, name, 4);
if ( !pwa ) { if ( !pwa ) {
perror("Telnetd: no memory\n"); perror("Telnetd: no memory\n");
return 0; return 0;
} }
pwa->t = fn; pwa->t = fn;
pwa->a = fnarg; pwa->a = fnarg;
if ((sc=rtems_task_create( if ((sc=rtems_task_create(
rtems_build_name(nm[0], nm[1], nm[2], nm[3]), rtems_build_name(nm[0], nm[1], nm[2], nm[3]),
(rtems_task_priority)priority, (rtems_task_priority)priority,
stackSize, stackSize,
RTEMS_DEFAULT_MODES, RTEMS_DEFAULT_MODES,
RTEMS_DEFAULT_ATTRIBUTES | RTEMS_FLOATING_POINT, RTEMS_DEFAULT_ATTRIBUTES | RTEMS_FLOATING_POINT,
&task_id)) || &task_id)) ||
(sc=rtems_task_start( (sc=rtems_task_start(
task_id, task_id,
wrap_delete, wrap_delete,
(rtems_task_argument)pwa))) { (rtems_task_argument)pwa))) {
free(pwa); free(pwa);
rtems_error(sc,"Telnetd: spawning task failed"); rtems_error(sc,"Telnetd: spawning task failed");
return 0; return 0;
} }
return (void*)task_id; return (void*)task_id;
} }
/* convenience routines for CEXP (retrieve stdio descriptors /* convenience routines for CEXP (retrieve stdio descriptors
* from reent structure) * from reent structure)
*
*/ */
#ifdef stdin #ifdef stdin
static __inline__ FILE * static __inline__ FILE *

18
cpukit/telnetd/telnetd.h
View File

@@ -20,19 +20,23 @@ extern "C" {
/* /*
* Initialize the telnetd subsystem. * Initialize the telnetd subsystem.
* *
* cmd - function which is the "shell" telnetd invokes * cmd - function which is the "shell" telnetd invokes
* arg - context pointer to cmd * arg - context pointer to cmd
* dontSpawn - TRUE if telnetd takes over this task. * dontSpawn - TRUE if telnetd takes over this task.
* FALSE to create another task for the shell. * FALSE to create another task for the shell.
* stack - stack size of spawned task * stack - stack size of spawned task
* priority - initial priority of spawned task * priority - initial priority of spawned task
* askForPassword - TRUE if telnetd asks for password
* FALSE to invoke "cmd" with no password check.
* This may be OK if "cmd" includes its own check.
*/ */
int rtems_telnetd_initialize( int rtems_telnetd_initialize(
void (*cmd)(char *, void *), void (*cmd)(char *, void *),
void *arg, void *arg,
int dontSpawn, int dontSpawn,
size_t stack, size_t stack,
rtems_task_priority priority rtems_task_priority priority,
int askForPassword
); );
#ifdef __cplusplus #ifdef __cplusplus