wip clientsocket -> clientsocket *

inc/Request.hpp

@@ -4,6 +4,7 @@
 
 #include <string>
 #include <map>
+#include "ClientSocket.hpp"
 
 class Request {
     private:

src/loop/loop.cpp

@@ -9,7 +9,7 @@
 //     return oss.str();
 // }
 
-static bool setRevents(std::map<int, ServerSocket> &ssmap, std::map<int, ClientSocket> &csmap) {
+static bool setRevents(std::map<int, ServerSocket> &ssmap, std::map<int, ClientSocket*> &csmap) {
     std::vector<struct pollfd> pollfds;
     for(std::map<int, ServerSocket>::iterator iter = ssmap.begin(); iter != ssmap.end(); ++iter) {
         struct pollfd pfd;
@@ -18,7 +18,7 @@ static bool setRevents(std::map<int, ServerSocket> &ssmap, std::map<int, ClientS
         pfd.events = POLLIN;
         pollfds.push_back(pfd);
     }
-    for(std::map<int, ClientSocket>::iterator iter = csmap.begin(); iter != csmap.end(); ++iter) {
+    for(std::map<int, ClientSocket*>::iterator iter = csmap.begin(); iter != csmap.end(); ++iter) {
         struct pollfd pfd;
         std::memset(&pfd, 0, sizeof(struct pollfd));
         pfd.fd = iter->first;
@@ -31,14 +31,13 @@ static bool setRevents(std::map<int, ServerSocket> &ssmap, std::map<int, ClientS
     }
     for(std::vector<struct pollfd>::iterator iter = pollfds.begin(); iter != pollfds.end(); ++iter) {
         if (ssmap.find(iter->fd) != ssmap.end()) { ssmap[iter->fd].setRevents(iter->revents); }
-        else if (csmap.find(iter->fd) != csmap.end()) { csmap[iter->fd].setRevents(iter->revents); }
+        else if (csmap.find(iter->fd) != csmap.end()) { csmap[iter->fd]->setRevents(iter->revents); }
     }
     return true;
 }
 
-static ClientSocket createCsocket(std::pair<int, sockaddr_in> socketInfo) {
-    ClientSocket cs(socketInfo.first);
-    return cs;    
+static ClientSocket *createCsocket(std::pair<int, sockaddr_in> socketInfo) {
+    return new(std::nothrow) ClientSocket(socketInfo.first);
 }
 
 static ClientSocket::csphase detectTimedOutClientSocket(ClientSocket &cs) {
@@ -50,39 +49,48 @@ static ClientSocket::csphase detectTimedOutClientSocket(ClientSocket &cs) {
 }
 
 bool loop(std::map<int, ServerSocket> &ssmap) {
-    std::map<int, ClientSocket> csmap;
+    std::map<int, ClientSocket*> csmap;
     std::map<int, Request> rqmap;
     while(true) {
         if (setRevents(ssmap, csmap) == false) { return false; }
         for(std::map<int, ServerSocket>::iterator iter = ssmap.begin(); iter != ssmap.end(); ++iter) {
             std::pair<int, sockaddr_in> socketInfo = iter->second.tryAccept();
             if (socketInfo.first == -1) { continue; }
-            csmap.insert(std::pair<int, ClientSocket>(socketInfo.first, createCsocket(socketInfo)));
+            ClientSocket *newCs;
+            newCs = createCsocket(socketInfo);
+            if (newCs == NULL) {
+                utils::putSysError("new");
+                close(socketInfo.first);
+                continue;
+            }
+            csmap.insert(std::pair<int, ClientSocket*>(socketInfo.first, newCs));
             rqmap.insert(std::pair<int, Request>(socketInfo.first, Request()));
         }
-        for (std::map<int, ClientSocket>::iterator iter = csmap.begin(); iter != csmap.end();) {
-            iter->second.setPhase(detectTimedOutClientSocket(iter->second));
-            switch (iter->second.getPhase()) {
+        for (std::map<int, ClientSocket*>::iterator iter = csmap.begin(); iter != csmap.end();) {
+            iter->second->setPhase(detectTimedOutClientSocket(*(iter->second)));
+            switch (iter->second->getPhase()) {
                 case ClientSocket::RECV:
-                    iter->second.setPhase(iter->second.tryRecv());
+                    iter->second->setPhase(iter->second->tryRecv());
                     ++iter;
                     break;
                 case ClientSocket::SEND:
-                    iter->second.setPhase(iter->second.trySend());
+                    iter->second->setPhase(iter->second->trySend());
+                    ++iter;
                     break;
                 case ClientSocket::CLOSE:
-                    std::map<int, ClientSocket>::iterator toErase = iter;
+                    std::map<int, ClientSocket*>::iterator toErase = iter;
                     ++iter;
-                    iter->second.close();
+                    toErase->second->close();
+                    delete toErase->second;
                     csmap.erase(toErase);
                     break;
             }
         }
-        for (std::map<int, Request>::iterator iter = rqmap.begin(); iter != rqmap.end();) {
-            std::map<int, ClientSocket>::iterator csiter = csmap.find(iter->first);
-            if (csiter != csmap.end() && csiter->second.buffer.str().find("\r\n") != std::string::npos) {
-                ClientSocket::csphase nextcsphase = iter->second.load(csiter->second.buffer);
-                csiter->second.setPhase(nextcsphase);
+        for (std::map<int, Request>::iterator iter = rqmap.begin(); iter != rqmap.end(); ++iter) {
+            std::map<int, ClientSocket*>::iterator csiter = csmap.find(iter->first);
+            if (csiter != csmap.end() && csiter->second->buffer.str().find("\r\n") != std::string::npos) {
+                ClientSocket::csphase nextcsphase = iter->second.load(csiter->second->buffer);
+                csiter->second->setPhase(nextcsphase);
             }
         }
     }

src/request/Request.cpp

@@ -25,5 +25,11 @@ std::string const &Request::getHttpVersion() const{
 }
 
 ClientSocket::csphase Request::load(std::stringstream &buffer) {
-
+    std::string line;
+    std::getline(buffer, line);
+    std::stringstream ss(line);
+    ss >> this->_method;
+    ss >> this->_path;
+    ss >> this->_httpVersion;
+    return ClientSocket::CLOSE;
 }