Changeset 158 for uKadecot/trunk/uip/apps/webserver

Timestamp:

Feb 20, 2016, 10:43:32 PM (8 years ago)

Author:

coas-nagasima

Message:

インクルードのパス指定をContikiに合わせ変更。
整数型の型名をContikiに合わせ変更。

Location:

uKadecot/trunk/uip/apps/webserver

Files:

• http_parser.c (modified) (1 diff)
• http_pcb.h (modified) (1 diff)
• httpd-fs.h (modified) (1 diff)
• httpd.c (modified) (1 diff)
• httpd.h (modified) (2 diffs)
• websocket.c (modified) (3 diffs)

uKadecot/trunk/uip/apps/webserver/http_parser.c

@@ -22 +22 @@
  * IN THE SOFTWARE.
  */
-#include "http_parser.h"
+#include "webserver/http_parser.h"
 //#include <assert.h>
 #include <stddef.h>

uKadecot/trunk/uip/apps/webserver/http_pcb.h

@@ -23 +23 @@
 #define __HTTP_PCB_H__
 
-#include "http_parser.h"
+#include "webserver/http_parser.h"
 
 #define MAX_ELEMENT_SIZE 256

uKadecot/trunk/uip/apps/webserver/httpd-fs.h

@@ -54 +54 @@
 #ifdef HTTPD_FS_STATISTICS
 #if HTTPD_FS_STATISTICS == 1
-u16_t httpd_fs_count(char *name);
+uint16_t httpd_fs_count(char *name);
 #endif /* HTTPD_FS_STATISTICS */
 #endif /* HTTPD_FS_STATISTICS */

uKadecot/trunk/uip/apps/webserver/httpd.c

@@ -56 +56 @@
  */
 
-#include "uip.h"
+#include "net/ip/uip.h"
 #include "httpd.h"
 #include "httpd-fs.h"

uKadecot/trunk/uip/apps/webserver/httpd.h

@@ -36 +36 @@
 #define __HTTPD_H__
 
-#include "psock.h"
+#include "net/ip/psock.h"
 #include "httpd-fs.h"
 #include "http_pcb.h"
@@ -76 +76 @@
 
 void httpd_log(char *msg);
-void httpd_log_file(u16_t *requester, char *file);
+void httpd_log_file(uint16_t *requester, char *file);
 
 #endif /* __HTTPD_H__ */

uKadecot/trunk/uip/apps/webserver/websocket.c

@@ -38 +38 @@
 #include <string.h>
 #include "websocket.h"
-#include "uip.h"
+#include "net/ip/uip.h"
 #include "kernel.h"
 #include "kernel_cfg.h"
@@ -69 +69 @@
 {
         ws_state_t *s = &ws->rstate;
-        const u8_t *pos = (const u8_t *)data, *end = &((const u8_t *)data)[len];
+        const uint8_t *pos = (const uint8_t *)data, *end = &((const uint8_t *)data)[len];
 
         for(; pos < end; pos++){
@@ -192 +192 @@
 {
         ws_state_t *s = &ws->wstate;
-        u8_t *pos = (u8_t *)data, *end = &((u8_t *)data)[len];
+        uint8_t *pos = (uint8_t *)data, *end = &((uint8_t *)data)[len];
 
         for(; pos < end; pos++){