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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Oliver Schmidt 2011-04-12 14:14:45 +02:00
commit 78f7a74689
12 changed files with 281 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/rest-http/http-common.h
View file

@ -50,10 +50,9 @@ extern const char* header_delimiter;
/*HTTP method types*/
typedef enum {
HTTP_METHOD_GET = (1 << 0),
HTTP_METHOD_HEAD = (1 << 1),
HTTP_METHOD_POST = (1 << 2),
HTTP_METHOD_PUT = (1 << 3),
HTTP_METHOD_DELETE = (1 << 4)
HTTP_METHOD_POST = (1 << 1),
HTTP_METHOD_PUT = (1 << 2),
HTTP_METHOD_DELETE = (1 << 3)
} http_method_t;
//DY : FIXME right now same enum names with COAP with different values. Will this work fine?

6
apps/rest-http/http-server.c
View file

@ -7,7 +7,7 @@
#include "buffer.h"
#include "rest-util.h"
#if !UIP_CONF_IPV6_RPL
#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET)
#include "static-routing.h"
#endif
@ -235,8 +235,6 @@ is_method_handled(connection_state_t* conn_state, const char* method)
/*other method types can be added here if needed*/
if(strncmp(method, http_get_string, 3) == 0) {
conn_state->request.request_type = HTTP_METHOD_GET;
} else if(strncmp(method, http_head_string, 4) == 0) {
conn_state->request.request_type = HTTP_METHOD_HEAD;
} else if (strncmp(method, http_post_string, 4) == 0) {
conn_state->request.request_type = HTTP_METHOD_POST;
} else if (strncmp(method, http_put_string, 3) == 0) {
@ -595,7 +593,7 @@ PROCESS_THREAD(http_server, ev, data)
PROCESS_BEGIN();
/* if static routes are used rather than RPL */
#if !UIP_CONF_IPV6_RPL
#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET)
set_global_address();
configure_routing();
#endif /*!UIP_CONF_IPV6_RPL*/