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

Merge pull request #223 from simonduq/pr/rpl-br-no-ws

Browse Source 
Disable RPL BR Web server on Sky
This commit is contained in:
George Oikonomou 2017-12-09 14:58:01 +00:00 committed by GitHub
commit d0e6d2516d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 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>
*/
#include <stdio.h>
#include <string.h>
#include "contiki.h"
#include "contiki-net.h"
#if UIP_CONF_TCP == 0
#error HTTP server needs TCP enabled
#endif
#include <stdio.h>
#include <string.h>
#include "httpd-simple.h"
#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);
}
#if BORDER_ROUTER_CONF_WEBSERVER
/*---------------------------------------------------------------------------*/
PROCESS(webserver_nogui_process, "Web server");
PROCESS_THREAD(webserver_nogui_process, ev, data)
@ -332,4 +331,4 @@ httpd_simple_get_script(const char *name)
{
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
#endif
#ifndef BORDER_ROUTER_CONF_WEBSERVER
#define BORDER_ROUTER_CONF_WEBSERVER 1
#endif
#if BORDER_ROUTER_CONF_WEBSERVER
#define UIP_CONF_TCP 1

6
examples/rpl-border-router/embedded/sky/target-conf.h
View File

@ -32,8 +32,10 @@
#ifndef TARGET_CONF_H_
#define TARGET_CONF_H_
/*---------------------------------------------------------------------------*/
#define QUEUEBUF_CONF_NUM 4
#define UIP_CONF_BUFFER_SIZE 140
/* Save some RAM and ROM */
#define QUEUEBUF_CONF_NUM 4
#define UIP_CONF_BUFFER_SIZE 140
#define BORDER_ROUTER_CONF_WEBSERVER 0
/*---------------------------------------------------------------------------*/
#endif /* TARGET_CONF_H_ */
/*---------------------------------------------------------------------------*/