X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=blobdiff_plain;f=src%2FconnectionParam.h;h=563391ca2ba015b7d508d6d2e36ca181d11e5106;hp=ed24531e1df96a5984b8ad61b0a1000befc8e0a6;hb=ef0cacf2508418915d3f64b04003be3c13fed3cc;hpb=ece844834d2cecc028ce81ca283f5d441088580e diff --git a/src/connectionParam.h b/src/connectionParam.h index ed24531..563391c 100644 --- a/src/connectionParam.h +++ b/src/connectionParam.h @@ -11,7 +11,7 @@ * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, * Christian Pointner * * This file is part of Anytun. @@ -44,36 +44,36 @@ class ConnectionParam { public: - ConnectionParam(const ConnectionParam & src); - ConnectionParam( KeyDerivation& kd, SeqWindow& seq_window, seq_nr_t seq_nr_, PacketSourceEndpoint remote_end); + ConnectionParam(const ConnectionParam& src); + ConnectionParam(KeyDerivation& kd, SeqWindow& seq_window, seq_nr_t seq_nr_, PacketSourceEndpoint remote_end); KeyDerivation& kd_; SeqWindow& seq_window_; - seq_nr_t seq_nr_; - PacketSourceEndpoint remote_end_; + seq_nr_t seq_nr_; + PacketSourceEndpoint remote_end_; private: //TODO: check if this is ok - Mutex mutex_; + Mutex mutex_; friend class boost::serialization::access; template - void serialize(Archive & ar, const unsigned int version) - { - Lock lock(mutex_); - std::string remote_host(remote_end_.address().to_string()); - u_int16_t remote_port = remote_end_.port(); - ar & kd_; - ar & seq_window_; - ar & seq_nr_; - ar & remote_host; - ar & remote_port; - PacketSourceEndpoint emptyEndpoint; - UDPPacketSource::proto::endpoint endpoint(boost::asio::ip::address::from_string(remote_host), remote_port); - //This is a workarround, against race condition in sync process - //TODO: find a better solution - if (endpoint != emptyEndpoint && remote_host != "::" && remote_host != "[::]" && remote_host != "0.0.0.0") - remote_end_ = endpoint; - } + void serialize(Archive& ar, const unsigned int version) { + Lock lock(mutex_); + std::string remote_host(remote_end_.address().to_string()); + uint16_t remote_port = remote_end_.port(); + ar& kd_; + ar& seq_window_; + ar& seq_nr_; + ar& remote_host; + ar& remote_port; + PacketSourceEndpoint emptyEndpoint; + UDPPacketSource::proto::endpoint endpoint(boost::asio::ip::address::from_string(remote_host), remote_port); + //This is a workarround, against race condition in sync process + //TODO: find a better solution + if(endpoint != emptyEndpoint && remote_host != "::" && remote_host != "[::]" && remote_host != "0.0.0.0") { + remote_end_ = endpoint; + } + } }; #endif