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

telnetd: Remove superfluous global variable

Browse Source 
Update #3528.
This commit is contained in:
Sebastian Huber
2018-09-26 09:06:43 +02:00
parent b980f36306
commit 0413b14cf7
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cpukit/telnetd/telnetd.c
View File

@@ -88,7 +88,6 @@ rtems_id telnetd_dflt_spawn(
/***********************************************************/ /***********************************************************/
static rtems_telnetd_config_table *telnetd_config; static rtems_telnetd_config_table *telnetd_config;
static rtems_id telnetd_task_id;
/* /*
* chrisj: this variable was global and with no declared interface in a header * chrisj: this variable was global and with no declared interface in a header
@@ -194,10 +193,10 @@ rtems_task_telnetd(void *task_argument)
int i=1; int i=1;
int size_adr; int size_adr;
struct shell_args *arg = NULL; struct shell_args *arg = NULL;
rtems_id task_id;
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");
telnetd_task_id = RTEMS_ID_NONE;
rtems_task_delete(RTEMS_SELF); rtems_task_delete(RTEMS_SELF);
}; };
setsockopt(des_socket,SOL_SOCKET,SO_KEEPALIVE,&i,sizeof(i)); setsockopt(des_socket,SOL_SOCKET,SO_KEEPALIVE,&i,sizeof(i));
@@ -209,13 +208,11 @@ rtems_task_telnetd(void *task_argument)
if ((bind(des_socket,&srv.sa,size_adr))<0) { if ((bind(des_socket,&srv.sa,size_adr))<0) {
perror("telnetd:bind"); perror("telnetd:bind");
close(des_socket); close(des_socket);
telnetd_task_id = RTEMS_ID_NONE;
rtems_task_delete(RTEMS_SELF); rtems_task_delete(RTEMS_SELF);
}; };
if ((listen(des_socket,5))<0) { if ((listen(des_socket,5))<0) {
perror("telnetd:listen"); perror("telnetd:listen");
close(des_socket); close(des_socket);
telnetd_task_id = RTEMS_ID_NONE;
rtems_task_delete(RTEMS_SELF); rtems_task_delete(RTEMS_SELF);
}; };
@@ -257,14 +254,14 @@ rtems_task_telnetd(void *task_argument)
arg->arg = telnetd_config->arg; arg->arg = telnetd_config->arg;
strncpy(arg->peername, peername, sizeof(arg->peername)); strncpy(arg->peername, peername, sizeof(arg->peername));
telnetd_task_id = telnetd_spawn_task( task_id = telnetd_spawn_task(
arg->pty.name, arg->pty.name,
telnetd_config->priority, telnetd_config->priority,
telnetd_config->stack_size, telnetd_config->stack_size,
spawned_shell, spawned_shell,
arg arg
); );
if (telnetd_task_id == RTEMS_ID_NONE) { if (task_id == RTEMS_ID_NONE) {
FILE *dummy; FILE *dummy;
if ( telnetd_spawn_task != telnetd_dflt_spawn ) { if ( telnetd_spawn_task != telnetd_dflt_spawn ) {
@@ -294,11 +291,12 @@ rtems_task_telnetd(void *task_argument)
* counts and eventually clean up... * counts and eventually clean up...
*/ */
close(des_socket); close(des_socket);
telnetd_task_id = RTEMS_ID_NONE;
} }
rtems_status_code rtems_telnetd_start(const rtems_telnetd_config_table* config) rtems_status_code rtems_telnetd_start(const rtems_telnetd_config_table* config)
{ {
rtems_id task_id;
if (telnetd_config != NULL) { if (telnetd_config != NULL) {
fprintf(stderr, "telnetd already started\n"); fprintf(stderr, "telnetd already started\n");
return RTEMS_RESOURCE_IN_USE; return RTEMS_RESOURCE_IN_USE;
@@ -333,14 +331,14 @@ rtems_status_code rtems_telnetd_start(const rtems_telnetd_config_table* config)
} }
/* Spawn task */ /* Spawn task */
telnetd_task_id = telnetd_spawn_task( task_id = telnetd_spawn_task(
"TNTD", "TNTD",
telnetd_config->priority, telnetd_config->priority,
telnetd_config->stack_size, telnetd_config->stack_size,
rtems_task_telnetd, rtems_task_telnetd,
0 0
); );
if (telnetd_task_id == RTEMS_ID_NONE) { if (task_id == RTEMS_ID_NONE) {
free(telnetd_config); free(telnetd_config);
telnetd_config = NULL; telnetd_config = NULL;
return RTEMS_IO_ERROR; return RTEMS_IO_ERROR;