X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fio%2Frecord.h;h=48dd8afee59fe37e8551f527c16172ef2722c8b8;hb=e0713d1539887566e0ea7d85942c305ec727c9dd;hp=88576651ea574c25c2c7f2ebf83ad44e8ec6d5f1;hpb=1aee468deafb447ebda1b6034c5233f13a5058c5;p=cassiopeia.git diff --git a/src/io/record.h b/src/io/record.h index 8857665..48dd8af 100644 --- a/src/io/record.h +++ b/src/io/record.h @@ -4,8 +4,9 @@ #include #include - +#include #include "bios.h" +#include "io/opensslBIO.h" #define RECORD_HEADER_SIZE 17 @@ -59,10 +60,10 @@ public: template static void read( std::string::const_iterator& it, T& val ) { union typeConversion { - char buf[sizeof(T)]; + char buf[sizeof( T )]; T value; - typeConversion(const T& v) : value(v) {} + typeConversion( const T& v ) : value( v ) {} }; typeConversion data( 0 ); @@ -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 log ); +std::string parseCommand( RecordHeader& head, const std::string& input ); +std::string parseCommandChunked( RecordHeader& head, std::shared_ptr conn); -void sendCommand( RecordHeader& head, const std::string& data, std::shared_ptr bio, std::shared_ptr log ); +void sendCommand( RecordHeader& head, const std::string& data, std::shared_ptr bio );