The parser is now associated to a particular connection (peer) so that it can...

The parser is now associated to a particular connection (peer) so that it can parse a request from multiple tcp packets

main.cc

@@ -18,6 +18,7 @@ class MyHandler : public Net::Http::Handler {
                 response.headers
                     .add(std::make_shared<Server>("lys"))
                     .add(std::make_shared<ContentType>(MIME(Text, Plain)));
+
                 response.writeTo(peer);
 
             }

src/http.cc

@@ -148,7 +148,6 @@ namespace Private {
         if (n == Cursor::Eof) return State::Again;
         else if (n != ' ') raise("Malformed HTTP Request");
 
-
         if (!cursor.advance(2)) return State::Again;
 
         size_t start = cursor;
@@ -203,12 +202,14 @@ namespace Private {
             while (cursor.current() != ':')
                 if (!cursor.advance(1)) return State::Again;
 
+            // Skip the ':'
             if (!cursor.advance(1)) return State::Again;
 
             std::string name = std::string(cursor.offset(start), cursor.diff(start) - 1);
 
-            // Skip the ':'
-            if (!cursor.advance(1)) return State::Again;
+            // Ignore spaces
+            while (cursor.current() == ' ')
+                if (!cursor.advance(1)) return State::Again;
 
             // Read the header value
             start = cursor;
@@ -309,6 +310,7 @@ namespace Private {
 
         memcpy(buffer.data + buffer.len, data, len);
         buffer.len += len;
+
         return true;
     }
 
@@ -434,6 +436,8 @@ Response::writeTo(Tcp::Peer& peer)
 
 void
 Handler::onInput(const char* buffer, size_t len, Tcp::Peer& peer) {
+    auto& parser = getParser(peer);
+
     if (!parser.feed(buffer, len)) {
         cout << "Could not feed parser bro" << endl;
     }
@@ -454,6 +458,21 @@ void
 Handler::onOutput() {
 }
 
+void
+Handler::onConnection(Tcp::Peer& peer) {
+    peer.setData(std::make_shared<Private::Parser>());
+}
+
+void
+Handler::onDisconnection(Tcp::Peer& peer) {
+}
+
+Private::Parser&
+Handler::getParser(Tcp::Peer& peer) {
+    auto data = peer.data();
+    return *std::static_pointer_cast<Private::Parser>(data);
+}
+
 Endpoint::Endpoint()
 { }
 

src/http.h

@@ -259,6 +259,9 @@ namespace Private {
             feed(data, len);
         }
 
+        Parser(const Parser& other) = delete;
+        Parser(Parser&& other) = default;
+
         bool feed(const char* data, size_t len);
         void reset();
 
@@ -272,7 +275,7 @@ namespace Private {
     private:
         static constexpr size_t StepsCount = 3;
 
-        std::unique_ptr<Step> allSteps[StepsCount];
+        std::array<std::unique_ptr<Step>, StepsCount> allSteps;
         size_t currentStep;
 
         ssize_t contentLength;
@@ -326,10 +329,14 @@ public:
     void onInput(const char* buffer, size_t len, Tcp::Peer& peer);
     void onOutput();
 
+    void onConnection(Tcp::Peer& peer);
+    void onDisconnection(Tcp::Peer& peer);
+
     virtual void onRequest(const Request& request, Tcp::Peer& peer) = 0;
 
 private:
-    Private::Parser parser;
+    Private::Parser& getParser(Tcp::Peer& peer);
+
 };
 
 class Endpoint {

src/listener.cc

@@ -139,7 +139,7 @@ IoWorker::handleIncoming(const std::shared_ptr<Peer>& peer) {
                 }
             } else {
                 if (errno == ECONNRESET) {
-                    handler_->onDisconnection(peer);
+                    handler_->onDisconnection(*peer);
                     close(fd);
                 }
                 else {
@@ -149,7 +149,7 @@ IoWorker::handleIncoming(const std::shared_ptr<Peer>& peer) {
             break;
         }
         else if (bytes == 0) {
-            handler_->onDisconnection(peer);
+            handler_->onDisconnection(*peer);
             close(fd);
             break;
         }
@@ -174,7 +174,7 @@ IoWorker::handleNewPeer(const std::shared_ptr<Peer>& peer)
         peers.insert(std::make_pair(fd, peer));
     }
 
-    handler_->onConnection(peer);
+    handler_->onConnection(*peer);
     poller.addFd(fd, NotifyOn::Read, Polling::Tag(fd), Polling::Mode::Edge);
 }
 
@@ -226,11 +226,11 @@ Handler::~Handler()
 { }
 
 void
-Handler::onConnection(const std::shared_ptr<Peer>& peer) {
+Handler::onConnection(Tcp::Peer& peer) {
 }
 
 void
-Handler::onDisconnection(const std::shared_ptr<Peer>& peer) {
+Handler::onDisconnection(Tcp::Peer& peer) {
 }
 
 Listener::Listener()

src/listener.h

@@ -105,8 +105,8 @@ public:
     virtual void onInput(const char *buffer, size_t len, Tcp::Peer& peer) = 0;
     virtual void onOutput() = 0;
 
-    virtual void onConnection(const std::shared_ptr<Peer>& peer);
-    virtual void onDisconnection(const std::shared_ptr<Peer>& peer);
+    virtual void onConnection(Tcp::Peer& peer);
+    virtual void onDisconnection(Tcp::Peer& peer);
 
 };
 

src/peer.cc

@@ -15,11 +15,13 @@ using namespace std;
 
 Peer::Peer()
     : fd_(-1)
+    , data_(nullptr)
 { }
 
 Peer::Peer(const Address& addr)
     : addr(addr)
     , fd_(-1)
+    , data_(nullptr)
 { }
 
 Address
@@ -46,6 +48,16 @@ Peer::fd() const {
     return fd_;
 }
 
+void
+Peer::setData(std::shared_ptr<void> data) {
+    data_ = std::move(data);
+}
+
+std::shared_ptr<void>
+Peer::data() const {
+    return data_;
+}
+
 std::ostream& operator<<(std::ostream& os, const Peer& peer) {
     const auto& addr = peer.address();
     os << "(" << addr.host() << ", " << addr.port() << ") [" << peer.hostname() << "]";

src/peer.h

@@ -10,6 +10,7 @@
 #include "os.h"
 #include <string>
 #include <iostream>
+#include <memory>
 
 namespace Net {
 
@@ -26,10 +27,15 @@ public:
     void associateFd(Fd fd);
     Fd fd() const;
 
+    std::shared_ptr<void> data() const;
+    void setData(std::shared_ptr<void> data);
+
 private:
+
     Address addr;
     std::string hostname_;
     Fd fd_;
+    std::shared_ptr<void> data_;
 };
 
 std::ostream& operator<<(std::ostream& os, const Peer& peer);