X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fio%2Frecord.cpp;h=422244e0021e2d06216df0f31e2ea7f626ee914b;hb=f8d1606423c351f2003ce18258ef047e0d2af326;hp=bd0cc1b8d1e965636575c4c122244bd5f50a076b;hpb=3ea4de25c712971a35dbad27d8834d75933daa08;p=cassiopeia.git

diff --git a/src/io/record.cpp b/src/io/record.cpp
index bd0cc1b..422244e 100644
--- a/src/io/record.cpp
+++ b/src/io/record.cpp
@@ -5,8 +5,9 @@
 #include <memory>
 #include <sstream>
 
-#include "bios.h"
-#include "opensslBIO.h"
+#include "io/bios.h"
+#include "io/opensslBIO.h"
+#include "log/logger.hpp"
 
 std::string toHexAndChecksum( const std::string& src ) {
     char checksum = 0;
@@ -23,19 +24,30 @@ std::string toHexAndChecksum( const std::string& src ) {
     return ss.str();
 }
 
-void sendCommand( RecordHeader& head, const std::string& data, std::shared_ptr<OpensslBIO> bio, std::shared_ptr<std::ostream> log ) {
-    head.payloadLength = data.size();
-    std::string s;
-    s += head.packToString();
-    s += data;
+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() ); 
+    size_t pos = 0;
+    head.offset = 0;
+    head.totalLength = data.size();
+    while(pos < data.size()){
+        size_t toTransfer = std::min(static_cast<size_t>(0xF000), data.size() - pos);
+        head.payloadLength = toTransfer;
 
-    std::string res = toHexAndChecksum( s );
+        std::string s;
+        s += head.packToString();
+        s += data.substr(pos, toTransfer);
 
-    if( log ) {
-        ( *log.get() ) << "FINE: RECORD output: " << res << std::endl;
-    }
+        std::string res = toHexAndChecksum( s );
+
+        logger::debug( "FINE: RECORD output: ", res );
 
-    bio->write( res.data(), res.size() );
+        bio->write( res.data(), res.size() );
+
+        pos += toTransfer;
+        head.offset += 1;
+    }
 }
 
 int32_t fromHexDigit( char c ) {
@@ -52,17 +64,14 @@ int32_t fromHexDigit( char c ) {
     return res;
 }
 
-std::string parseCommand( RecordHeader& head, const std::string& input, std::shared_ptr<std::ostream> log ) {
-    if( log ) {
-        ( *log.get() ) << "FINE: RECORD input: " << input << std::endl;
-    }
+std::string parseCommand( RecordHeader& head, const std::string& input) {
+    logger::debug( "FINE: RECORD input: ", input );
 
     int32_t dlen = ( input.size() - 2 ) / 2;
     char checksum = 0;
     bool error = false;
 
     std::string str( std::max( dlen, RECORD_HEADER_SIZE ), 0 );
-    str.append( 0, dlen );
 
     for( int i = 0; i < dlen; i++ ) {
         int32_t digit;
@@ -83,7 +92,13 @@ std::string parseCommand( RecordHeader& head, const std::string& input, std::sha
     uint32_t expectedTotalLength = ( RECORD_HEADER_SIZE + len + 1 /*checksum*/ ) * 2 + 2;
     std::string data = str.substr( RECORD_HEADER_SIZE, str.size() - RECORD_HEADER_SIZE );
 
-    if( checksum != -1 || expectedTotalLength != input.size() || error || dlen < RECORD_HEADER_SIZE ) {
+    if( expectedTotalLength != input.size() ) {
+        std::stringstream ss;
+        ss << "Expected: " << expectedTotalLength << ", Got: " << input.size();
+        logger::error( ss.str() );
+        throw "Error, invalid length";
+    }
+    if( checksum != -1 || error || dlen < RECORD_HEADER_SIZE ) {
         throw "Error, invalid checksum";
     }
 
@@ -91,31 +106,20 @@ std::string parseCommand( RecordHeader& head, const std::string& input, std::sha
 
     return data;
 }
-
-/*
-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;
+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;
+    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( head, io->readLine() );
     }
-
-
-    return 0;
+    return all;
 }
-*/