Merge "fmt: whitespace, padding and indentation formatting"

[cassiopeia.git] / src / io / record.h

diff --git a/src/io/record.h b/src/io/record.h
index 0a1368117fc681099fe74b6cf8dca60a45da926d..5d6e659b7439689157c704a303eefbf7cfcc0d64 100644 (file)
--- a/src/io/record.h
+++ b/src/io/record.h
@@ -4,8 +4,9 @@
 
 #include <memory>
 #include <string>
-
+#include <exception>
 #include "bios.h"
+#include "io/opensslBIO.h"
 
 #define RECORD_HEADER_SIZE 17
 
@@ -89,7 +90,7 @@ public:
 
     void unpackFromString( const std::string& str ) {
         if( str.size() != RECORD_HEADER_SIZE ) {
-            throw "Invalid string length";
+            throw std::runtime_error( "Invalid string length" );
         }
 
         auto it =  str.cbegin();
@@ -101,9 +102,12 @@ public:
         read( it, offset );
         read( it, payloadLength );
     }
-
+    bool isFollowupOf( const RecordHeader& head ) {
+        return head.command == command && head.flags == flags && head.sessid == sessid && head.command_count == command_count && head.totalLength == totalLength && head.offset + 1 == offset;
+    }
 };
 
-std::string parseCommand( RecordHeader& head, const std::string& input, std::shared_ptr<std::ostream> log );
+std::string parseCommand( RecordHeader& head, const std::string& input );
+std::string parseCommandChunked( RecordHeader& head, std::shared_ptr<OpensslBIOWrapper> conn );
 
-void sendCommand( RecordHeader& head, const std::string& data, std::shared_ptr<OpensslBIO> bio, std::shared_ptr<std::ostream> log );
+void sendCommand( RecordHeader& head, const std::string& data, std::shared_ptr<OpensslBIO> bio );