giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

RPL border router: re-enable Web-server-free compilation

This commit is contained in:
Simon Duquennoy 2017-12-09 08:59:32 +01:00 committed by Simon Duquennoy
parent 76d549fc00
commit b339c42a09
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/rpl-border-router/common/httpd-simple.c
View File

@ -37,14 +37,11 @@
* Joakim Eriksson <joakime@sics.se> * Joakim Eriksson <joakime@sics.se>
*/ */
#include <stdio.h> #include "contiki.h"
#include <string.h>
#include "contiki-net.h" #include "contiki-net.h"
#if UIP_CONF_TCP == 0 #include <stdio.h>
#error HTTP server needs TCP enabled #include <string.h>
#endif
#include "httpd-simple.h" #include "httpd-simple.h"
#define webserver_log_file(...) #define webserver_log_file(...)

3
examples/rpl-border-router/common/webserver.c
View File

@ -310,7 +310,6 @@ PT_THREAD(generate_routes(struct httpd_state *s))
PSOCK_END(&s->sout); PSOCK_END(&s->sout);
} }
#if BORDER_ROUTER_CONF_WEBSERVER
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS(webserver_nogui_process, "Web server"); PROCESS(webserver_nogui_process, "Web server");
PROCESS_THREAD(webserver_nogui_process, ev, data) PROCESS_THREAD(webserver_nogui_process, ev, data)
@ -332,4 +331,4 @@ httpd_simple_get_script(const char *name)
{ {
return generate_routes; return generate_routes;
} }
#endif /* BORDER_ROUTER_CONF_WEBSERVER */ /*---------------------------------------------------------------------------*/

2
examples/rpl-border-router/embedded/project-conf.h
View File

@ -44,7 +44,9 @@
#define WEBSERVER_CONF_CFS_CONNS 2 #define WEBSERVER_CONF_CFS_CONNS 2
#endif #endif
#ifndef BORDER_ROUTER_CONF_WEBSERVER
#define BORDER_ROUTER_CONF_WEBSERVER 1 #define BORDER_ROUTER_CONF_WEBSERVER 1
#endif
#if BORDER_ROUTER_CONF_WEBSERVER #if BORDER_ROUTER_CONF_WEBSERVER
#define UIP_CONF_TCP 1 #define UIP_CONF_TCP 1