X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fio%2Frecord.h;h=48dd8afee59fe37e8551f527c16172ef2722c8b8;hb=e0713d1539887566e0ea7d85942c305ec727c9dd;hp=ba5a8d8be7d6f789557d91fe8f0bd813af1b592b;hpb=cb4c74b47e6643f15e503067c197f86cbc5e6263;p=cassiopeia.git

diff --git a/src/io/record.h b/src/io/record.h
index ba5a8d8..48dd8af 100644
--- 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
 
@@ -52,18 +53,26 @@ public:
     }
 
     template <class T>
-    void append( std::string& str, T val ) {
+    static void append( std::string& str, T val ) {
         str.append( ( char* ) &val, sizeof( T ) );
     }
 
     template <class T>
-    void read( std::string::iterator& it, T& val ) {
-        char* data = ( char* ) &val;
+    static void read( std::string::const_iterator& it, T& val ) {
+        union typeConversion {
+            char buf[sizeof( T )];
+            T value;
+
+            typeConversion( const T& v ) : value( v ) {}
+        };
+
+        typeConversion data( 0 );
 
         for( size_t i = 0; i < sizeof( T ); i++ ) {
-            data[i] = *it;
-            it++;
+            data.buf[i] = *it++;
         }
+
+        val = data.value;
     }
 
     std::string packToString() {
@@ -79,12 +88,12 @@ public:
         return res;
     }
 
-    void unpackFromString( std::string str ) {
+    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.begin();
+        auto it =  str.cbegin();
         read( it, command );
         read( it, flags );
         read( it, sessid );
@@ -93,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 );