From 46824932fc0ca6ef1b70d81ab239e3823c0d7bd4 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Sat, 14 Apr 2007 13:40:53 +0000 Subject: [PATCH] Direct httpd logs to the Contiki log for non-CTK scenarios. --- apps/webserver/webserver-nogui.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/apps/webserver/webserver-nogui.c b/apps/webserver/webserver-nogui.c index c0791cad1..7e19fb929 100644 --- a/apps/webserver/webserver-nogui.c +++ b/apps/webserver/webserver-nogui.c @@ -29,19 +29,20 @@ * * This file is part of the Contiki OS. * - * $Id: webserver-nogui.c,v 1.2 2006/08/09 16:13:39 bg- Exp $ + * $Id: webserver-nogui.c,v 1.3 2007/04/14 13:40:53 oliverschmidt Exp $ * */ +#include +#include #include "contiki.h" +#include "sys/log.h" + #include "http-strings.h" #include "webserver.h" #include "httpd.h" -#include -#include - PROCESS(webserver_nogui_process, "Web server"); /*---------------------------------------------------------------------------*/ PROCESS_THREAD(webserver_nogui_process, ev, data) @@ -61,10 +62,19 @@ PROCESS_THREAD(webserver_nogui_process, ev, data) void httpd_log_file(uip_ipaddr_t *requester, char *file) { +#if LOG_CONF_ENABLED + char buf[18]; + + /* Print out IP address of requesting host. */ + sprintf(buf, "%d.%d.%d.%d: ", requester->u8[0], requester->u8[1], + requester->u8[2], requester->u8[3]); + log_message(buf, file); +#endif /* LOG_CONF_ENABLED */ } /*---------------------------------------------------------------------------*/ void httpd_log(char *msg) { + log_message(msg, ""); } /*---------------------------------------------------------------------------*/