surrond client main-loop with better catches

[cassiopeia.git] / src / io / record.h

diff --git a/src/io/record.h b/src/io/record.h
index 27c40c13e0aa2717c59ae53b6d7541c839fdee90..28a9b1e710da79be26bbff034207328bf7fd86aa 100644 (file)
--- a/src/io/record.h
+++ b/src/io/record.h
@@ -57,13 +57,21 @@ public:
     }
 
     template <class T>
-    static void read( std::string::iterator& it, T&& val ) {
-        char* data = reinterpret_cast<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 +87,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 );
@@ -96,6 +104,6 @@ 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 );
 
-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 );