From 16b9e9e0c7e36ab8d14a0a5be3aa10ea40d15fd3 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 31 Jan 2012 17:38:45 +0000 Subject: Fix a error the telnet driver read method. Don't return if only protocol stuff is read git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4352 42af7a65-404d-4744-a932-0658087f49c3 --- apps/netutils/telnetd/telnetd_driver.c | 37 ++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'apps/netutils/telnetd/telnetd_driver.c') diff --git a/apps/netutils/telnetd/telnetd_driver.c b/apps/netutils/telnetd/telnetd_driver.c index 7507ad1c0..1950c881b 100644 --- a/apps/netutils/telnetd/telnetd_driver.c +++ b/apps/netutils/telnetd/telnetd_driver.c @@ -508,29 +508,36 @@ static ssize_t telnetd_read(FAR struct file *filep, FAR char *buffer, size_t len nllvdbg("len: %d\n", len); /* First, handle the case where there are still valid bytes left in the - * I/O buffer from the last time that read was called. + * I/O buffer from the last time that read was called. NOTE: Much of + * what we read may be protocol stuff and may not correspond to user + * data. Hence we need the loop and we need may need to call psock_recv() + * multiple times in order to get data that the client is interested in. */ - if (priv->td_pending > 0) + do { - FAR const char *src = &priv->td_rxbuffer[priv->td_offset]; - ret = telnetd_receive(priv, src, priv->td_pending, buffer, len); - } + if (priv->td_pending > 0) + { + FAR const char *src = &priv->td_rxbuffer[priv->td_offset]; + ret = telnetd_receive(priv, src, priv->td_pending, buffer, len); + } - /* Read a buffer of data from the telnet client */ + /* Read a buffer of data from the telnet client */ - else - { - ret = psock_recv(&priv->td_psock, priv->td_rxbuffer, - CONFIG_TELNETD_RXBUFFER_SIZE, 0); - if (ret > 0) + else { - /* Process the received telnet data */ + ret = psock_recv(&priv->td_psock, priv->td_rxbuffer, + CONFIG_TELNETD_RXBUFFER_SIZE, 0); + if (ret > 0) + { + /* Process the received telnet data */ - telnetd_dumpbuffer("Received buffer", priv->td_rxbuffer, ret); - ret = telnetd_receive(priv, priv->td_rxbuffer, ret, buffer, len); - } + telnetd_dumpbuffer("Received buffer", priv->td_rxbuffer, ret); + ret = telnetd_receive(priv, priv->td_rxbuffer, ret, buffer, len); + } + } } + while (ret == 0); return ret; } -- cgit v1.2.3