upd: use central position to do line buffering

[cassiopeia.git] / src / io / recordHandler.cpp

diff --git a/src/io/recordHandler.cpp b/src/io/recordHandler.cpp
index b2fe82c2973783a73f863370df590ad3b6ee0878..2d58be0b7d1e195e62350ebaadd4cc9191074b4f 100644 (file)
--- a/src/io/recordHandler.cpp
+++ b/src/io/recordHandler.cpp
@@ -72,16 +72,7 @@ public:
     }
 
     void work() {
-        std::vector<char> buffer( 2048 );
-        int res = io->read( buffer.data(), buffer.size() );
-
-        if( res <= 0 ) {
-            logger::error( "Stream error, resetting SSL" );
-            parent->reset();
-            return;
-        }
-
-        std::string content( buffer.data(), res );
+        std::string content = io->readLine();
 
         try {
             RecordHeader head;
@@ -242,6 +233,9 @@ void DefaultRecordHandler::handle() {
         logger::note( "New session allocated." );
         currentSession = std::make_shared<RecordHandlerSession>( this, signer, ctx, bio );
     }
-
-    currentSession->work();
+    try {
+        currentSession->work();
+    } catch( EOFException e ){
+        reset();
+    }
 }