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

nshlib: Reuse nsh_session logic in nsh_telnetmain

Browse Source 
to avoid the code duplication

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-10-17 05:17:41 +08:00 committed by Alan Carvalho de Assis
parent 8e460e7e19
commit 75455d3788
8 changed files with 55 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nshlib/nsh.h
View File

@ -647,6 +647,13 @@
* Public Types * Public Types
****************************************************************************/ ****************************************************************************/
enum nsh_login_e
{
NSH_LOGIN_NONE = 0, /* Don't Performs the login sequence */
NSH_LOGIN_LOCAL, /* Performs the login sequence as local user */
NSH_LOGIN_TELNET /* Performs the login sequence as telnet client */
};
#ifndef CONFIG_NSH_DISABLE_ITEF #ifndef CONFIG_NSH_DISABLE_ITEF
/* State when parsing and if-then-else sequence */ /* State when parsing and if-then-else sequence */
@ -866,7 +873,7 @@ int nsh_loginscript(FAR struct nsh_vtbl_s *vtbl);
struct console_stdio_s; struct console_stdio_s;
int nsh_session(FAR struct console_stdio_s *pstate, int nsh_session(FAR struct console_stdio_s *pstate,
bool login, int argc, FAR char *argv[]); int login, int argc, FAR char *argv[]);
int nsh_parse(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline); int nsh_parse(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline);
/**************************************************************************** /****************************************************************************

2
nshlib/nsh_altconsole.c
View File

@ -273,7 +273,7 @@ int nsh_consolemain(int argc, FAR char *argv[])
/* Execute the session */ /* Execute the session */
nsh_session(pstate, true, argc, argv); nsh_session(pstate, NSH_LOGIN_LOCAL, argc, argv);
/* We lost the connection. Wait for the keyboard to /* We lost the connection. Wait for the keyboard to
* be re-connected. * be re-connected.

2
nshlib/nsh_consolemain.c
View File

@ -71,7 +71,7 @@ int nsh_consolemain(int argc, FAR char *argv[])
/* Execute the session */ /* Execute the session */
ret = nsh_session(pstate, true, argc, argv); ret = nsh_session(pstate, NSH_LOGIN_LOCAL, argc, argv);
/* Exit upon return */ /* Exit upon return */

22
nshlib/nsh_session.c
View File

@ -66,7 +66,7 @@
****************************************************************************/ ****************************************************************************/
int nsh_session(FAR struct console_stdio_s *pstate, int nsh_session(FAR struct console_stdio_s *pstate,
bool login, int argc, FAR char *argv[]) int login, int argc, FAR char *argv[])
{ {
FAR struct nsh_vtbl_s *vtbl; FAR struct nsh_vtbl_s *vtbl;
int ret = EXIT_FAILURE; int ret = EXIT_FAILURE;
@ -74,9 +74,9 @@ int nsh_session(FAR struct console_stdio_s *pstate,
DEBUGASSERT(pstate); DEBUGASSERT(pstate);
vtbl = &pstate->cn_vtbl; vtbl = &pstate->cn_vtbl;
if (login)
{
#ifdef CONFIG_NSH_CONSOLE_LOGIN #ifdef CONFIG_NSH_CONSOLE_LOGIN
if (login == NSH_LOGIN_LOCAL)
{
/* Login User and Password Check */ /* Login User and Password Check */
if (nsh_login(pstate) != OK) if (nsh_login(pstate) != OK)
@ -84,8 +84,24 @@ int nsh_session(FAR struct console_stdio_s *pstate,
nsh_exit(vtbl, 1); nsh_exit(vtbl, 1);
return -1; /* nsh_exit does not return */ return -1; /* nsh_exit does not return */
} }
}
else
#endif /* CONFIG_NSH_CONSOLE_LOGIN */ #endif /* CONFIG_NSH_CONSOLE_LOGIN */
#ifdef CONFIG_NSH_TELNET_LOGIN
if (login == NSH_LOGIN_TELNET)
{
/* Login User and Password Check */
if (nsh_telnetlogin(pstate) != OK)
{
nsh_exit(vtbl, 1);
return -1; /* nsh_exit does not return */
}
}
#endif /* CONFIG_NSH_TELNET_LOGIN */
if (login != NSH_LOGIN_NONE)
{
/* Present a greeting and possibly a Message of the Day (MOTD) */ /* Present a greeting and possibly a Message of the Day (MOTD) */
fputs(g_nshgreeting, pstate->cn_outstream); fputs(g_nshgreeting, pstate->cn_outstream);

22
nshlib/nsh_stdsession.c
View File

@ -65,7 +65,7 @@
****************************************************************************/ ****************************************************************************/
int nsh_session(FAR struct console_stdio_s *pstate, int nsh_session(FAR struct console_stdio_s *pstate,
bool login, int argc, FAR char *argv[]) int login, int argc, FAR char *argv[])
{ {
FAR struct nsh_vtbl_s *vtbl; FAR struct nsh_vtbl_s *vtbl;
int ret = EXIT_FAILURE; int ret = EXIT_FAILURE;
@ -74,9 +74,9 @@ int nsh_session(FAR struct console_stdio_s *pstate,
DEBUGASSERT(pstate); DEBUGASSERT(pstate);
vtbl = &pstate->cn_vtbl; vtbl = &pstate->cn_vtbl;
if (login)
{
#ifdef CONFIG_NSH_CONSOLE_LOGIN #ifdef CONFIG_NSH_CONSOLE_LOGIN
if (login == NSH_LOGIN_LOCAL)
{
/* Login User and Password Check */ /* Login User and Password Check */
if (nsh_stdlogin(pstate) != OK) if (nsh_stdlogin(pstate) != OK)
@ -84,8 +84,24 @@ int nsh_session(FAR struct console_stdio_s *pstate,
nsh_exit(vtbl, 1); nsh_exit(vtbl, 1);
return -1; /* nsh_exit does not return */ return -1; /* nsh_exit does not return */
} }
}
else
#endif /* CONFIG_NSH_CONSOLE_LOGIN */ #endif /* CONFIG_NSH_CONSOLE_LOGIN */
#ifdef CONFIG_NSH_TELNET_LOGIN
if (login == NSH_LOGIN_TELNET)
{
/* Login User and Password Check */
if (nsh_telnetlogin(pstate) != OK)
{
nsh_exit(vtbl, 1);
return -1; /* nsh_exit does not return */
}
}
#endif /* CONFIG_NSH_TELNET_LOGIN */
if (login != NSH_LOGIN_NONE)
{
/* Present a greeting and possibly a Message of the Day (MOTD) */ /* Present a greeting and possibly a Message of the Day (MOTD) */
printf("%s", g_nshgreeting); printf("%s", g_nshgreeting);

2
nshlib/nsh_system.c
View File

@ -45,7 +45,7 @@ static int nsh_system_(int argc, FAR char *argv[], int isctty)
/* Execute the session */ /* Execute the session */
ret = nsh_session(pstate, false, argc, argv); ret = nsh_session(pstate, NSH_LOGIN_NONE, argc, argv);
/* Exit upon return */ /* Exit upon return */

122
nshlib/nsh_telnetd.c
View File

@ -67,131 +67,19 @@ enum telnetd_state_e
int nsh_telnetmain(int argc, FAR char *argv[]) int nsh_telnetmain(int argc, FAR char *argv[])
{ {
UNUSED(argc);
UNUSED(argv);
FAR struct console_stdio_s *pstate = nsh_newconsole(true); FAR struct console_stdio_s *pstate = nsh_newconsole(true);
FAR struct nsh_vtbl_s *vtbl;
int ret; int ret;
DEBUGASSERT(pstate != NULL); DEBUGASSERT(pstate != NULL);
vtbl = &pstate->cn_vtbl;
ninfo("Session [%d] Started\n", getpid()); /* Execute the session */
#ifdef CONFIG_NSH_TELNET_LOGIN ret = nsh_session(pstate, NSH_LOGIN_TELNET, argc, argv);
/* Login User and Password Check */
if (nsh_telnetlogin(pstate) != OK) /* Exit upon return */
{
nsh_exit(vtbl, 1);
return -1; /* nsh_exit does not return */
}
#endif /* CONFIG_NSH_TELNET_LOGIN */
/* The following logic mostly the same as the login in nsh_session.c. It nsh_exit(&pstate->cn_vtbl, ret);
* differs only in that gets() is called to get the command instead of return ret;
* readline().
*/
/* Present a greeting and possibly a Message of the Day (MOTD) */
fputs(g_nshgreeting, pstate->cn_outstream);
#ifdef CONFIG_NSH_MOTD
# ifdef CONFIG_NSH_PLATFORM_MOTD
/* Output the platform message of the day */
platform_motd(vtbl->iobuffer, IOBUFFERSIZE);
fprintf(pstate->cn_outstream, "%s\n", vtbl->iobuffer);
# else
/* Output the fixed message of the day */
fprintf(pstate->cn_outstream, "%s\n", g_nshmotd);
# endif
#endif
fflush(pstate->cn_outstream);
/* Execute the login script */
#ifdef CONFIG_NSH_ROMFSRC
nsh_loginscript(vtbl);
#endif
/* Then enter the command line parsing loop */
for (; ; )
{
/* Get the next line of input from the Telnet client */
#ifdef CONFIG_TELNET_CHARACTER_MODE
#ifdef CONFIG_NSH_CLE
/* cle() returns a negated errno value on failure (errno is not set) */
ret = cle(pstate->cn_line, g_nshprompt, CONFIG_NSH_LINELEN,
INSTREAM(pstate), OUTSTREAM(pstate));
if (ret < 0)
{
fprintf(pstate->cn_errstream, g_fmtcmdfailed, "nsh_telnetmain",
"cle", NSH_ERRNO_OF(-ret));
nsh_exit(vtbl, 1);
}
#else
/* Display the prompt string */
fputs(g_nshprompt, pstate->cn_outstream);
fflush(pstate->cn_outstream);
/* readline() returns EOF on failure (errno is not set) */
ret = readline(pstate->cn_line, CONFIG_NSH_LINELEN,
INSTREAM(pstate), OUTSTREAM(pstate));
if (ret == EOF)
{
/* NOTE: readline() does not set the errno variable, but perhaps we
* will be lucky and it will still be valid.
*/
fprintf(pstate->cn_errstream, g_fmtcmdfailed, "nsh_telnetmain",
"readline", NSH_ERRNO);
nsh_exit(vtbl, 1);
}
#endif
#else
/* Display the prompt string */
fputs(g_nshprompt, pstate->cn_outstream);
fflush(pstate->cn_outstream);
/* fgets() returns NULL on failure (errno will be set) */
if (fgets(pstate->cn_line, CONFIG_NSH_LINELEN,
INSTREAM(pstate)) == NULL)
{
fprintf(pstate->cn_errstream, g_fmtcmdfailed, "nsh_telnetmain",
"fgets", NSH_ERRNO);
nsh_exit(vtbl, 1);
}
ret = strlen(pstate->cn_line);
#endif
/* Parse process the received Telnet command */
nsh_parse(vtbl, pstate->cn_line);
fflush(pstate->cn_outstream);
}
/* Clean up */
nsh_exit(vtbl, 0);
/* We do not get here, but this is necessary to keep some compilers happy */
UNUSED(ret);
return OK;
} }
/**************************************************************************** /****************************************************************************

2
nshlib/nsh_usbconsole.c
View File

@ -292,7 +292,7 @@ int nsh_consolemain(int argc, FAR char *argv[])
/* Execute the session */ /* Execute the session */
nsh_session(pstate, true, argc, argv); nsh_session(pstate, NSH_LOGIN_LOCAL, argc, argv);
/* Switch to /dev/null because we probably no longer have a /* Switch to /dev/null because we probably no longer have a
* valid console device. * valid console device.