Added webserver app to the Win32 port.
diff --git a/contiki-win32/main.c b/contiki-win32/main.c
index 4f3a869..76f4f68 100644
--- a/contiki-win32/main.c
+++ b/contiki-win32/main.c
@@ -32,7 +32,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: main.c,v 1.7 2005/02/15 00:10:41 oliverschmidt Exp $
+ * $Id: main.c,v 1.8 2005/02/15 00:28:03 oliverschmidt Exp $
*
*/
@@ -52,6 +52,7 @@
#include "netconf-dsc.h"
#include "dhcp-dsc.h"
#include "www-dsc.h"
+#include "webserver-dsc.h"
#include "telnet-dsc.h"
#include "email-dsc.h"
#include "calc-dsc.h"
@@ -101,7 +102,7 @@
program_handler_init();
-#if 0
+#if 1
uip_ipaddr(addr, 192,168,0,3);
uip_sethostaddr(addr);
@@ -121,6 +122,7 @@
program_handler_add(&netconf_dsc, "Network setup", 1);
program_handler_add(&dhcp_dsc, "DHCP client", 1);
program_handler_add(&www_dsc, "Web browser", 1);
+ program_handler_add(&webserver_dsc, "Web server", 1);
program_handler_add(&telnet_dsc, "Telnet", 1);
program_handler_add(&email_dsc, "E-mail program", 1);
program_handler_add(&calc_dsc, "Calculator", 1);
diff --git a/contiki-win32/win32.dsp b/contiki-win32/win32.dsp
index b0e1641..ba8f73a 100644
--- a/contiki-win32/win32.dsp
+++ b/contiki-win32/win32.dsp
@@ -70,8 +70,8 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "WITH_ASCII" /D "WITH_UIP" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX- /Os /Gf /Gy /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "NDEBUG" /D "WITH_RAWSOCK" /D "WITH_ASCII" /D "WITH_UIP" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# SUBTRACT CPP /Z<none> /Ox /Og
+# ADD CPP /nologo /W3 /Os /Gf /Gy /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "NDEBUG" /D "WITH_RAWSOCK" /D "WITH_ASCII" /D "WITH_UIP" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# SUBTRACT CPP /Ox /Og
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
@@ -122,7 +122,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "WITH_ASCII" /D "WITH_UIP" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX- /Os /Gf /Gy /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "NDEBUG" /D "WITH_PPP" /D "WITH_ASCII" /D "WITH_UIP" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Os /Gf /Gy /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "NDEBUG" /D "WITH_PPP" /D "WITH_ASCII" /D "WITH_UIP" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# SUBTRACT CPP /Ox /Og
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
@@ -234,6 +234,30 @@
# End Source File
# Begin Source File
+SOURCE="..\contiki\apps\httpd-cgi.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\contiki\apps\httpd-cgi.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\contiki\apps\httpd-fs.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\contiki\apps\httpd-fs.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\contiki\apps\httpd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\contiki\apps\httpd.h
+# End Source File
+# Begin Source File
+
SOURCE="..\contiki\apps\netconf-dsc.c"
# End Source File
# Begin Source File
@@ -314,6 +338,22 @@
# End Source File
# Begin Source File
+SOURCE="..\contiki\apps\webserver-dsc.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\contiki\apps\webserver-dsc.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\contiki\apps\webserver.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\contiki\apps\webserver.h
+# End Source File
+# Begin Source File
+
SOURCE="..\contiki\apps\www-dsc.c"
# End Source File
# Begin Source File
@@ -430,6 +470,10 @@
# End Source File
# Begin Source File
+SOURCE=..\contiki\lib\memb.c
+# End Source File
+# Begin Source File
+
SOURCE=..\contiki\lib\memb.h
# End Source File
# Begin Source File
@@ -683,6 +727,14 @@
# End Source File
# Begin Source File
+SOURCE=..\contiki\uip\socket.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\contiki\uip\socket.h
+# End Source File
+# Begin Source File
+
SOURCE=..\contiki\uip\tcpip.c
# End Source File
# Begin Source File
@@ -719,6 +771,14 @@
# End Source File
# Begin Source File
+SOURCE=..\contiki\uip\uipbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\contiki\uip\uipbuf.h
+# End Source File
+# Begin Source File
+
SOURCE=..\contiki\uip\uiplib.c
# End Source File
# Begin Source File