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

Fix errors in handle_send

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2024 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-08-16 14:29:08 +00:00
parent 275133b216
commit 98fe680d4b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netutils/thttpd/thttpd.c
View File

@ -474,11 +474,16 @@ static void handle_send(struct connect_s *conn, struct timeval *tv)
ndbg("File read error: %d\n", errno); ndbg("File read error: %d\n", errno);
goto errout_clear_connection; goto errout_clear_connection;
} }
nvdbg("Read %d bytes, buflen %d\n", nread, hc->buflen);
/* Send the buffer */ /* Send the buffer */
if (hc->buflen > 0) if (hc->buflen > 0)
{ {
/* httpd_write does not return until all bytes have been sent
* (or an error occurs).
*/
nwritten = httpd_write(hc->conn_fd, hc->buffer, hc->buflen); nwritten = httpd_write(hc->conn_fd, hc->buffer, hc->buflen);
if (nwritten < 0) if (nwritten < 0)
{ {
@ -495,21 +500,27 @@ static void handle_send(struct connect_s *conn, struct timeval *tv)
/* And update how much of the file we wrote */ /* And update how much of the file we wrote */
conn->offset += nread; conn->offset += nwritten;
conn->hc->bytes_sent += nread; conn->hc->bytes_sent += nwritten;
nvdbg("Wrote %d bytes\n", nwritten);
} }
/* Are we done? */ /* Are we done? */
nvdbg("offset: %d end_offset: %d bytes_sent: %d\n",
conn->offset, conn->end_offset, conn->hc->bytes_sent);
if (conn->offset >= conn->end_offset) if (conn->offset >= conn->end_offset)
{ {
/* This connection is finished! */ /* This connection is finished! */
nvdbg("Finish connection\n");
finish_connection(conn, tv); finish_connection(conn, tv);
return;
} }
return;
errout_clear_connection: errout_clear_connection:
ndbg("Clear connection\n");
clear_connection(conn, tv); clear_connection(conn, tv);
return; return;
} }