deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

When a file was not found, and no notfound.html was found, send directory contents instead

Browse source
This commit is contained in:
adamdunkels 2010-02-02 18:17:55 +00:00
parent 3f5bb28383
commit e029cf489e
1 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
apps/webserver/httpd-cfs.c
View file

@ -30,9 +30,13 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: httpd-cfs.c,v 1.11 2009/02/09 13:04:37 fros4943 Exp $ * $Id: httpd-cfs.c,v 1.12 2010/02/02 18:17:55 adamdunkels Exp $
*/ */
#include <stdio.h>
#ifndef HAVE_SNPRINTF
int snprintf(char *str, size_t size, const char *format, ...);
#endif /* HAVE_SNPRINTF */
#include <string.h> #include <string.h>
#include "contiki-net.h" #include "contiki-net.h"
@ -83,6 +87,34 @@ PT_THREAD(send_file(struct httpd_state *s))
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static static
PT_THREAD(send_dir(struct httpd_state *s))
{
static char buf[80];
static int r, num;
static struct cfs_dir dir;
static struct cfs_dirent dirent;
PSOCK_BEGIN(&s->sout);
SEND_STRING(&s->sout, "<body>File system contents:<br>\r\n");
r = cfs_opendir(&dir, "/");
if(r == 0) {
num = 0;
while(cfs_readdir(&dir, &dirent) >= 0) {
snprintf(buf, sizeof(buf), "<a href=\"/%s\">%s</a><br>", dirent.name, dirent.name);
SEND_STRING(&s->sout, buf);
++num;
}
snprintf(buf, sizeof(buf), "%d files</body>", num);
SEND_STRING(&s->sout, buf);
cfs_closedir(&dir);
} else {
SEND_STRING(&s->sout, "Could not open directory</body>");
}
PSOCK_END(&s->sout);
}
/*---------------------------------------------------------------------------*/
static
PT_THREAD(send_headers(struct httpd_state *s, const char *statushdr)) PT_THREAD(send_headers(struct httpd_state *s, const char *statushdr))
{ {
char *ptr; char *ptr;
@ -119,8 +151,11 @@ PT_THREAD(handle_output(struct httpd_state *s))
if(s->fd < 0) { if(s->fd < 0) {
s->fd = cfs_open("notfound.html", CFS_READ); s->fd = cfs_open("notfound.html", CFS_READ);
if(s->fd < 0) { if(s->fd < 0) {
uip_abort(); PT_WAIT_THREAD(&s->outputpt,
memb_free(&conns, s); send_headers(s, http_header_200));
PT_WAIT_THREAD(&s->outputpt,
send_dir(s));
uip_close();
webserver_log_file(&uip_conn->ripaddr, "reset (no notfound.html)"); webserver_log_file(&uip_conn->ripaddr, "reset (no notfound.html)");
PT_EXIT(&s->outputpt); PT_EXIT(&s->outputpt);
} }