X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Fio%2Frecord.h;h=d56708aa9a768f84d453200f6c390e670c25c078;hb=d7f1459ca84043d24143395279de8f3cff86022b;hp=bcfc831c7b2206cd3a8faf81a8febf943d997048;hpb=b9a325b540fd50bc5381877513ba2e632502ea7b;p=cassiopeia.git

diff --git a/src/io/record.h b/src/io/record.h
index bcfc831..d56708a 100644
--- a/src/io/record.h
+++ b/src/io/record.h
@@ -6,6 +6,7 @@
 #include <string>
 
 #include "bios.h"
+#include "io/opensslBIO.h"
 
 #define RECORD_HEADER_SIZE 17
 
@@ -16,6 +17,8 @@ public:
         SET_SPKAC = 0x02,
         SET_SIGNATURE_TYPE = 0x10,
         SET_PROFILE = 0x11,
+        SET_WISH_FROM = 0x12,
+        SET_WISH_TO = 0x13,
         ADD_SAN = 0x18,
         ADD_AVA = 0x19,
         ADD_PROOF_LINE = 0x40,
@@ -50,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() {
@@ -77,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";
         }
 
-        auto it =  str.begin();
+        auto it =  str.cbegin();
         read( it, command );
         read( it, flags );
         read( it, sessid );
@@ -94,6 +105,7 @@ public:
 
 };
 
-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 );