fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-04 04:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a error the telnet driver read method. Don't return if only protocol stuff is read

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4352 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-01-31 17:38:45 +00:00
parent 1df049bbc3
commit 7702043472
3 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/netutils/telnetd/telnetd_daemon.c
+13 -10
View File
@@ -160,7 +160,10 @@ static int telnetd_daemon(int argc, char *argv[])
goto errout_with_socket;
}
/* Now go silent */
/* Now go silent. Only the lldbg family of debug functions should
* be used after this point because these do not depend on stdout
* being available.
*/
#ifndef CONFIG_DEBUG
close(0);
@@ -172,13 +175,13 @@ static int telnetd_daemon(int argc, char *argv[])
for (;;)
{
nvdbg("Accepting connections on port %d\n", ntohs(daemon->port));
nllvdbg("Accepting connections on port %d\n", ntohs(daemon->port));
addrlen = sizeof(struct sockaddr_in);
acceptsd = accept(listensd, (struct sockaddr*)&myaddr, &addrlen);
if (acceptsd < 0)
{
ndbg("accept failed: %d\n", errno);
nlldbg("accept failed: %d\n", errno);
goto errout_with_socket;
}
@@ -189,28 +192,28 @@ static int telnetd_daemon(int argc, char *argv[])
ling.l_linger = 30; /* timeout is seconds */
if (setsockopt(acceptsd, SOL_SOCKET, SO_LINGER, &ling, sizeof(struct linger)) < 0)
{
ndbg("setsockopt failed: %d\n", errno);
nlldbg("setsockopt failed: %d\n", errno);
goto errout_with_acceptsd;
}
#endif
/* Create a character device to "wrap" the accepted socket descriptor */
nvdbg("Creating the telnet driver\n");
nllvdbg("Creating the telnet driver\n");
devpath = telnetd_driver(acceptsd, daemon);
if (devpath < 0)
{
ndbg("telnetd_driver failed\n");
nlldbg("telnetd_driver failed\n");
goto errout_with_acceptsd;
}
/* Open the driver */
nvdbg("Opening the telnet driver\n");
nllvdbg("Opening the telnet driver\n");
drvrfd = open(devpath, O_RDWR);
if (drvrfd < 0)
{
ndbg("Failed to open %s: %d\n", devpath, errno);
nlldbg("Failed to open %s: %d\n", devpath, errno);
goto errout_with_acceptsd;
}
@@ -235,12 +238,12 @@ static int telnetd_daemon(int argc, char *argv[])
* will inherit the new stdin, stdout, and stderr.
*/
nvdbg("Starting the telnet session\n");
nllvdbg("Starting the telnet session\n");
pid = TASK_CREATE("Telnet session", daemon->priority, daemon->stacksize,
daemon->entry, NULL);
if (pid < 0)
{
ndbg("Failed start the telnet session: %d\n", errno);
nlldbg("Failed start the telnet session: %d\n", errno);
goto errout_with_acceptsd;
}