michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: telnet: Fix character mode handling

Browse source 
If the telnet client operates in a character mode, it may send
individual characters in packets. Such packets were dropped in the
telnet shell backend instead of being process by the shell engine.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2021-04-14 13:02:47 +02:00 • committed by Carles Cufí
commit 0b63a9618b
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/shell/shell_telnet.c
View file

@ -30,7 +30,7 @@ struct shell_telnet *sh_telnet;
#define TELNET_LINE_SIZE CONFIG_SHELL_TELNET_LINE_BUF_SIZE #define TELNET_LINE_SIZE CONFIG_SHELL_TELNET_LINE_BUF_SIZE
#define TELNET_TIMEOUT CONFIG_SHELL_TELNET_SEND_TIMEOUT #define TELNET_TIMEOUT CONFIG_SHELL_TELNET_SEND_TIMEOUT
#define TELNET_MIN_MSG 2 #define TELNET_MIN_COMMAND_LEN 2
/* Basic TELNET implmentation. */ /* Basic TELNET implmentation. */
@ -196,14 +196,12 @@ static void telnet_recv(struct net_context *client,
} }
len = net_pkt_remaining_data(pkt); len = net_pkt_remaining_data(pkt);
if (len < TELNET_MIN_MSG) {
LOG_DBG("Packet smaller than minimum length");
goto unref;
}
if (telnet_handle_command(pkt)) { if (len >= TELNET_MIN_COMMAND_LEN) {
LOG_DBG("Handled command"); if (telnet_handle_command(pkt)) {
goto unref; LOG_DBG("Handled command");
goto unref;
}
} }
/* Fifo add */ /* Fifo add */