Diff: HTTPServer.cpp

Revision:

5:70c9f6045f2d

Parent:

2:2f187e09bdb0

Child:

8:babc71c8c498

--- a/HTTPServer.cpp	Sun Feb 15 02:55:36 2015 +0000
+++ b/HTTPServer.cpp	Sun Feb 15 03:38:17 2015 +0000
@@ -11,7 +11,6 @@
 
 
 HTTPServer::HTTPServer():
-handlers(&cmp),
 reply()
 {
 }
@@ -91,33 +90,17 @@
     char* request_type = strtok(buffer, " ");
     char* request = strtok(NULL, " ");
 
-    reply[0] = '\0';
-    response_code = HTTP_404_NOTFOUND;
-
-    // リクエストされたURLをパースしてモーターを制御
-    parse_request(request);
-
-
-/*
-
-    if(!object.decode(request, reply)){
-        return;
+    // リクエストされたURLをパースし、モーターを制御
+    bool ret = parse_request(request);
+    if(ret){
+        response_code = HTTP_200_OK;    
+    }else{
+        response_code = HTTP_404_NOTFOUND;
     }
 
-    std::map<char*, RequestHandler*>::iterator itor = handlers.find(request_type);
-    if(itor == handlers.end())
-    {
-        printf("No request handler found for this type of request.\r\n");
-        return;
-    }
-    if(itor->second != NULL)
-        response_code = itor->second->handle(object, reply);
-    else
-        printf("Invalid request handler\r\n");
-*/        
+    reply[0] = '\0';
 }
 
-
 void HTTPServer::create_response(char *buffer)
 {
     char content_length[30] = "";
@@ -146,10 +129,3 @@
     /* add content */
     strcat(buffer, reply);
 }
-
-
-void HTTPServer::add_request_handler(char *name, RequestHandler* handler)
-{
-    handlers[name] = handler;
-    printf("%s request hander.\r\n", name);
-}