void sendCommand( RecordHeader& head, const std::string& data, std::shared_ptr<OpensslBIO> bio ) {
std::stringstream ss;
ss << data.size();
- logger::debugf( "Record payload length: %s", ss.str() );
- if(data.size() > 0xFFFF){
- logger::warn( "Data too big, need chunking" );
- }
- head.payloadLength = data.size();
- std::string s;
- s += head.packToString();
- s += data;
+ logger::debugf( "Record payload length: %s", ss.str() );
+ size_t pos = 0;
+ head.offset = 0;
+ head.totalLength = data.size();
+
+ do {
+ size_t toTransfer = std::min( static_cast<size_t>( 0xF000 ), data.size() - pos );
+ head.payloadLength = toTransfer;
+
+ std::string s;
+ s += head.packToString();
+ s += data.substr( pos, toTransfer );
- std::string res = toHexAndChecksum( s );
+ std::string res = toHexAndChecksum( s );
- logger::debug( "FINE: RECORD output: ", res );
+ logger::debug( "FINE: RECORD output: ", res );
- bio->write( res.data(), res.size() );
+ bio->write( res.data(), res.size() );
+
+ pos += toTransfer;
+ head.offset += 1;
+ } while( pos < data.size() );
}
int32_t fromHexDigit( char c ) {
return res;
}
-std::string parseCommand( RecordHeader& head, const std::string& input) {
+std::string parseCommand( RecordHeader& head, const std::string& input ) {
logger::debug( "FINE: RECORD input: ", input );
int32_t dlen = ( input.size() - 2 ) / 2;
std::stringstream ss;
ss << "Expected: " << expectedTotalLength << ", Got: " << input.size();
logger::error( ss.str() );
- throw "Error, invalid length";
+ throw std::length_error( "Error, invalid length" );
}
+
if( checksum != -1 || error || dlen < RECORD_HEADER_SIZE ) {
- throw "Error, invalid checksum";
+ throw std::runtime_error( "Error, invalid checksum" );
}
data.pop_back();
return data;
}
+std::string parseCommandChunked( RecordHeader& head, std::shared_ptr<OpensslBIOWrapper> io ) {
+ logger::note( "reading" );
+ std::string payload = parseCommand( head, io->readLine() );
+ std::string all( head.totalLength, ' ' );
+ auto target = all.begin();
+ size_t pos = 0;
+ RecordHeader head2;
-/*
-int main( int argc, char* argv[] ) {
- OpensslBIOWrapper *bio = new OpensslBIOWrapper(BIO_new_fd(0, 0));
- std::string data = "halloPayload";
- RecordHeader head;
- head.command = 0x7;
- head.flags = 1;
- head.sessid = 13;
- head.command_count = 0xA0B;
- head.totalLength = 9;
- sendCommand( head, data, std::shared_ptr<OpensslBIO>(bio) );
- head.command = 0x8;
-
- try {
- std::string c = parseCommand( head, ":0700010D0000000B0A0900000000000C0068616C6C6F5061796C6F6164E6\n" );
-
- std::cout << "res: " << std::endl;
- std::cout << head.payloadLength << std::endl;
- std::cout << c << std::endl;
- } catch( char const* c ) {
- std::cout << "err: " << c << std::endl;
- }
+ while( true ) {
+ pos += head.payloadLength;
+ target = std::copy( payload.begin(), payload.end(), target );
+ if( pos >= head.totalLength ) {
+ break;
+ }
+
+ logger::note( "chunk digested, reading next one" );
+
+ payload = parseCommand( head2, io->readLine() );
+
+ if( !head2.isFollowupOf( head ) ) {
+ throw std::runtime_error( "Error, header of follow up chunk was malformed" );
+ }
+
+ head = head2;
+ }
- return 0;
+ return all;
}
-*/