diff options
| -rw-r--r-- | src/connectionParam.cpp | 8 | ||||
| -rw-r--r-- | src/connectionParam.h | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/connectionParam.cpp b/src/connectionParam.cpp index 0f507c3..c6b3ded 100644 --- a/src/connectionParam.cpp +++ b/src/connectionParam.cpp @@ -31,14 +31,10 @@ #include "connectionParam.h" -//ConnectionParam::ConnectionParam():kd_(*(new KeyDerivation)),seq_window_(*(new SeqWindow(0))),seq_nr_(0),remote_host_(""),remote_port_(0) -//{ -//} - -ConnectionParam::ConnectionParam(KeyDerivation& kd, SeqWindow& seq_window,seq_nr_t seq_nr, std::string remote_host, u_int16_t remote_port) : kd_(kd),seq_window_(seq_window),seq_nr_(seq_nr),remote_host_(remote_host), remote_port_(remote_port) +ConnectionParam::ConnectionParam(KeyDerivation& kd, SeqWindow& seq_window,seq_nr_t seq_nr, PacketSourceEndpoint remote_end) : kd_(kd),seq_window_(seq_window),seq_nr_(seq_nr), remote_end_(remote_end) { } -ConnectionParam::ConnectionParam(const ConnectionParam & src) : kd_(src.kd_),seq_window_(src.seq_window_),seq_nr_(src.seq_nr_),remote_host_(src.remote_host_), remote_port_(src.remote_port_),mutex_() +ConnectionParam::ConnectionParam(const ConnectionParam & src) : kd_(src.kd_),seq_window_(src.seq_window_),seq_nr_(src.seq_nr_),remote_end_(src.remote_end_),mutex_() { } diff --git a/src/connectionParam.h b/src/connectionParam.h index 8558c24..7852e5c 100644 --- a/src/connectionParam.h +++ b/src/connectionParam.h @@ -37,6 +37,7 @@ #include "authAlgo.h" #include "seqWindow.h" #include "threadUtils.hpp" +#include "packetSource.h" #include <boost/archive/text_oarchive.hpp> #include <boost/archive/text_iarchive.hpp> @@ -45,12 +46,12 @@ class ConnectionParam { public: ConnectionParam(const ConnectionParam & src); - ConnectionParam( KeyDerivation& kd, SeqWindow& seq_window, seq_nr_t seq_nr_, boost::asio::ip::udp::endpoint endpoint); + ConnectionParam( KeyDerivation& kd, SeqWindow& seq_window, seq_nr_t seq_nr_, PacketSourceEndpoint remote_end); KeyDerivation& kd_; SeqWindow& seq_window_; seq_nr_t seq_nr_; - boost::asio::ip::udp::endpoint endpoint_; + PacketSourceEndpoint remote_end_; private: //TODO: check if this is ok @@ -63,6 +64,7 @@ private: ar & kd_; ar & seq_window_; ar & seq_nr_; +// TODO fix sync of remote_end_ ar & remote_host_; ar & remote_port_; } |