diff options
| -rw-r--r-- | connectionParam.h | 2 | ||||
| -rw-r--r-- | keyDerivation.h | 1 | ||||
| -rw-r--r-- | syncBuffer.h | 14 |
3 files changed, 9 insertions, 8 deletions
diff --git a/connectionParam.h b/connectionParam.h index b73d49e..e41d8ea 100644 --- a/connectionParam.h +++ b/connectionParam.h @@ -47,10 +47,10 @@ public: KeyDerivation& kd_; SeqWindow& seq_window_; seq_nr_t seq_nr_; - sender_id_t sennder_id_; std::string remote_host_; u_int16_t remote_port_; private: +// ConnectionParam(const ConnectionParam & src); friend class boost::serialization::access; template<class Archive> void serialize(Archive & ar, const unsigned int version) diff --git a/keyDerivation.h b/keyDerivation.h index 420aa84..2bcd3f5 100644 --- a/keyDerivation.h +++ b/keyDerivation.h @@ -60,6 +60,7 @@ public: void clear(); private: + KeyDerivation(const KeyDerivation & src); friend class boost::serialization::access; template<class Archive> void serialize(Archive & ar, const unsigned int version) diff --git a/syncBuffer.h b/syncBuffer.h index 840d929..2058cdd 100644 --- a/syncBuffer.h +++ b/syncBuffer.h @@ -34,23 +34,23 @@ #include <boost/archive/text_oarchive.hpp> #include <boost/archive/text_iarchive.hpp> #include "buffer.h" +#include <iostream> +#include "datatypes.h" class SyncBuffer : public Buffer { public: - SyncBuffer() : Buffer(){}; - SyncBuffer(u_int32_t length) : Buffer(length){}; - SyncBuffer(Buffer b): Buffer(b) {}; - SyncBuffer(u_int8_t* data, u_int32_t length): Buffer(data,length) {}; + SyncBuffer() : Buffer(){ std::cout << " SyncBuffer() -> Length: " << length_ << std::endl;}; + SyncBuffer(u_int32_t length) : Buffer(length){ std::cout << "SyncBuffer(u_int32_t length) Length: " << length_ << std::endl; }; + SyncBuffer(Buffer b): Buffer(b) {std::cout << " SyncBuffer(Buffer b) " << length_ << std::endl;}; + SyncBuffer(u_int8_t* data, u_int32_t length): Buffer(data,length) { std::cout << "SyncBuffer(u_int8_t* data, u_int32_t length)-> Length: "<< length_ << std::endl;}; private: friend class boost::serialization::access; template<class Archive> void serialize(Archive & ar, const unsigned int version) { - u_int32_t ll = length_+1; - ar & ll; + std::cout << "Length: " << length_ << std::endl; ar & length_; - ar & ll; //for(u_int32_t i = 0; i < length_; i++) // ar & (*this)[i]; } |