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

system/telnet: POLL must not be disabled in configuration. Telnet client port argument is no optional.

Browse Source
This commit is contained in:
Gregory Nutt 2017-06-27 07:46:16 -06:00
parent 9091716419
commit 98204bad94
4 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/telnet/Kconfig
View File

@ -6,7 +6,7 @@
menuconfig SYSTEM_TELNET_CHATD menuconfig SYSTEM_TELNET_CHATD
bool "Telnet chat deamon" bool "Telnet chat deamon"
default n default n
depends on NET && NET_TCP depends on NET && NET_TCP && !DISABLE_POLL
select NETUTILS_TELNETC select NETUTILS_TELNETC
---help--- ---help---
Enable the Telnet Chat daemon. Enable the Telnet Chat daemon.
@ -34,7 +34,7 @@ endif # SYSTEM_TELNET_CHATD
menuconfig SYSTEM_TELNET_CLIENT menuconfig SYSTEM_TELNET_CLIENT
bool "Telnet client" bool "Telnet client"
default n default n
depends on NET && NET_TCP depends on NET && NET_TCP && !DISABLE_POLL
select NETUTILS_TELNETC select NETUTILS_TELNETC
select SYSTEM_READLINE select SYSTEM_READLINE
---help--- ---help---

10
system/telnet/telnet_chatd.c
View File

@ -317,7 +317,15 @@ static void _event_handler(struct telnet_s *telnet,
} }
} }
int main(int argc, char **argv) /****************************************************************************
* Public Functions
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
int main(int argc, FAR char *argv[])
#else
int chatd_main(int argc, char *argv[])
#endif
{ {
char buffer[512]; char buffer[512];
short listen_port; short listen_port;

40
system/telnet/telnet_client.c
View File

@ -74,6 +74,16 @@
#include "system/readline.h" #include "system/readline.h"
#include "netutils/telnetc.h" #include "netutils/telnetc.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifdef CONFIG_NSH_TELNETD_PORT
# define DEFAULT_PORT CONFIG_NSH_TELNETD_PORT
#else
# define DEFAULT_PORT 23
#endif
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
@ -246,11 +256,26 @@ static void _event_handler(struct telnet_s *telnet,
static void show_usage(const char *progname, int exitcode) static void show_usage(const char *progname, int exitcode)
{ {
fprintf(stderr, "Usage:\n %s <server-IP-addr> <port>\n", progname); fprintf(stderr, "Usage:\n");
fprintf(stderr, "\t%s <server-IP-addr> [<port>]\n", progname);
fprintf(stderr, "Where:\n");
fprintf(stderr, "\t<server-IP-addr> is the address of the Telnet server. Either\n");
fprintf(stderr, "\t\tIPv4 form: ddd.ddd.ddd.ddd\n");
fprintf(stderr, "\t\tIPv6 form: xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx\n");
fprintf(stderr, "\t<port> is the (optional) listening port of the Telnet server.\n");
fprintf(stderr, "\t\tDefault: %u\n", DEFAULT_PORT);
exit(exitcode) ; exit(exitcode) ;
} }
int main(int argc, char **argv) /****************************************************************************
* Public Functions
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
int main(int argc, FAR char *argv[])
#else
int telnet_main(int argc, char *argv[])
#endif
{ {
char buffer[512]; char buffer[512];
union union
@ -281,20 +306,27 @@ int main(int argc, char **argv)
/* Check usage */ /* Check usage */
if (argc != 3) if (argc < 2 || argc > 3)
{ {
fprintf(stderr, "Invalid number of arguments\n"); fprintf(stderr, "Invalid number of arguments\n");
show_usage(argv[0], 1); show_usage(argv[0], 1);
} }
/* Convert the port number to binary */ /* Convert the port number to binary if provided */
if (argc == 3)
{
portno = atoi(argv[2]); portno = atoi(argv[2]);
if (portno < 0 || portno > UINT16_MAX) if (portno < 0 || portno > UINT16_MAX)
{ {
fprintf(stderr, "Invalid port number\n"); fprintf(stderr, "Invalid port number\n");
show_usage(argv[0], 1); show_usage(argv[0], 1);
} }
}
else
{
portno = DEFAULT_PORT;
}
/* Convert the <server-IP-addr> argument into a binary address */ /* Convert the <server-IP-addr> argument into a binary address */