RemoteMCUの更新

[mimic/MiMicSDK.git] / projects / example / sample.net.simplehttpd / src / sketch.c
diff --git a/projects/example/sample.net.simplehttpd/src/sketch.c b/projects/example/sample.net.simplehttpd/src/sketch.c

index aa73c79..28ba255 100644 (file)
--- a/projects/example/sample.net.simplehttpd/src/sketch.c
+++ b/projects/example/sample.net.simplehttpd/src/sketch.c
@@ -3,41 +3,36 @@
   * ROMにある定義済みファイルの入出力と、クロスドメインRESTが確認できます。\r
   */\r
  #include "boot/sketch.h"\r
-#include "NyLPC_uipService.h"\r
-#include "NyLPC_httpService.h"\r
+#include "NyLPC_net.h"\r
+\r
+#include "NyLPC_http.h"\r
  #include "NyLPC_utils.h"\r
  \r
-#include "../net/NyLPC_cNet.h"\r
-#include "../net/httpd/NyLPC_cHttpd.h"\r
-#include "../net/httpd/mod/NyLPC_cModShortUrl.h"\r
  \r
  NyLPC_TcNet_t net;\r
  struct MyHttpd{\r
         NyLPC_TcHttpd_t super;\r
  }httpd;\r
  \r
+#define NUM_OF_FSDATA 4\r
+extern struct NyLPC_TRomFileData fsdata[];\r
+\r
  \r
  void handler(NyLPC_TcHttpdConnection_t* i_connection)\r
  {\r
-       NyLPC_TcModShortUrl_t mod_surl;\r
-\r
-       NyLPC_THttpMethodType m;\r
+       NyLPC_TcModUrl_t mod;\r
+       char url[64];\r
  \r
  \r
-\r
-       NyLPC_cModShortUrl_initialize(&mod_surl);\r
-       if(!NyLPC_cModShortUrl_execute(&mod_surl,i_connection)){\r
+       //SHORT URL\r
+       NyLPC_cModUrl_initialize(&mod);\r
+       if(!NyLPC_cModUrl_execute(&mod,i_connection,url,64)){\r
+               NyLPC_cModUrl_finalize(&mod);\r
                 return;\r
         }\r
-       m=NyLPC_cModShortUrl_getMethod(&mod_surl);\r
-       if(m!=NyLPC_THttpMethodType_HEAD || m!=NyLPC_THttpMethodType_GET){\r
-               NyLPC_cHttpdConnection_sendResponseHeader(i_connection,200,"text/html",NULL);\r
-       }\r
-       if(m==NyLPC_THttpMethodType_GET){\r
-               NyLPC_cHttpdConnection_sendResponseBodyF(i_connection,"<html>01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");\r
-               NyLPC_cHttpdConnection_sendResponseBodyF(i_connection,"</body></html>");\r
-       }\r
-       NyLPC_cModShortUrl_finalize(&mod_surl);\r
+       NyLPC_cHttpdConnection_sendResponseHeader(i_connection,200,"text/html",NULL);\r
+       NyLPC_cHttpdConnection_sendResponseBodyF(i_connection,"<html><h1>Your request path is %s</h1></html>",url);\r
+       NyLPC_cModUrl_finalize(&mod);\r
         return;\r
  }\r
  void setup(void)\r
@@ -45,7 +40,7 @@ void setup(void)
         //uipサービス初期化。いろいろ利用可能に。\r
         NyLPC_cNet_initialize(&net);\r
         NyLPC_cHttpd_initialize(&httpd.super,80);\r
-       httpd.super.function._handler=handler;\r
+       httpd.super.function.onRequest=handler;\r
  \r
  }\r
  \r