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

Several bugfixes, mostly from Darcy Gong

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5217 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-10-06 14:50:37 +00:00
parent 38c5f11690
commit f90c8836c0
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.txt
View File

@ -364,3 +364,7 @@
There are still a LOT of empty, stub Kconfig files. There are still a LOT of empty, stub Kconfig files.
* Kconfig: Fleshed out apps/examples/buttons/Kconfig. There are still a LOT * Kconfig: Fleshed out apps/examples/buttons/Kconfig. There are still a LOT
of empty, stub Kconfig files. of empty, stub Kconfig files.
* apps/netutils/webserver/httpd.c: Fix a bug that I introduced in
recent check-ins (Darcy Gong).
* apps/netutils/webclient/webclient.c: Fix another but that I introduced
when I was trying to add correct handling for loss of connection (Darcy Gong)

14
netutils/webclient/webclient.c
View File

@ -110,7 +110,7 @@ struct wget_s
FAR char *buffer; /* user-provided buffer */ FAR char *buffer; /* user-provided buffer */
int buflen; /* Length of the user provided buffer */ int buflen; /* Length of the user provided buffer */
int offset; /* Offset to the beginning of interesting data */ int offset; /* Offset to the beginning of interesting data */
int datend; /* Offset+1 to the last valid byte of data in the buffer */ int datend; /* Offset+1 to the last valid byte of data in the buffer */
/* Buffer HTTP header data and parse line at a time */ /* Buffer HTTP header data and parse line at a time */
@ -204,7 +204,7 @@ static inline int wget_resolvehost(const char *hostname, in_addr_t *ipaddr)
/* 'host' does not point to a valid address string. Try to resolve /* 'host' does not point to a valid address string. Try to resolve
* the host name to an IP address. * the host name to an IP address.
*/ */
if (resolv_query(hostname, &addr) < 0) if (resolv_query(hostname, &addr) < 0)
{ {
/* Needs to set the errno here */ /* Needs to set the errno here */
@ -401,10 +401,10 @@ exit:
* *
* Returned Value: * Returned Value:
* 0: if the GET operation completed successfully; * 0: if the GET operation completed successfully;
* -1: On a failure with errno set appropriately * -1: On a failure with errno set appropriately
* *
****************************************************************************/ ****************************************************************************/
int wget(FAR const char *url, FAR char *buffer, int buflen, int wget(FAR const char *url, FAR char *buffer, int buflen,
wget_callback_t callback, FAR void *arg) wget_callback_t callback, FAR void *arg)
{ {
@ -524,10 +524,10 @@ int wget(FAR const char *url, FAR char *buffer, int buflen,
ret = ws.datend; ret = ws.datend;
goto errout_with_errno; goto errout_with_errno;
} }
else if (ret == 0) else if (ws.datend == 0)
{ {
nvdbg("Connection lost\n"); nvdbg("Connection lost\n");
close(sockfd); close(sockfd);
break; break;
} }
@ -567,7 +567,7 @@ int wget(FAR const char *url, FAR char *buffer, int buflen,
else else
{ {
redirected = true; redirected = true;
close(sockfd); close(sockfd);
break; break;
} }
} }

2
netutils/webserver/httpd.c
View File

@ -694,7 +694,7 @@ static inline int httpd_parse(struct httpd_state *pstate)
while (state != STATE_BODY); while (state != STATE_BODY);
#if !defined(CONFIG_NETUTILS_HTTPD_SENDFILE) && !defined(CONFIG_NETUTILS_HTTPD_MMAP) #if !defined(CONFIG_NETUTILS_HTTPD_SENDFILE) && !defined(CONFIG_NETUTILS_HTTPD_MMAP)
if (0 == strcmp(pstate->ht_filename, "/") if (0 == strcmp(pstate->ht_filename, "/"))
{ {
strncpy(pstate->ht_filename, "/" CONFIG_NETUTILS_HTTPD_INDEX, strlen("/" CONFIG_NETUTILS_HTTPD_INDEX)); strncpy(pstate->ht_filename, "/" CONFIG_NETUTILS_HTTPD_INDEX, strlen("/" CONFIG_NETUTILS_HTTPD_INDEX));
} }