diff options
Diffstat (limited to 'src/networkAddress.h')
| -rw-r--r-- | src/networkAddress.h | 89 |
1 files changed, 43 insertions, 46 deletions
diff --git a/src/networkAddress.h b/src/networkAddress.h index dc4c7ac..df4f788 100644 --- a/src/networkAddress.h +++ b/src/networkAddress.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 <satp@wirdorange.org> * * This file is part of Anytun. @@ -48,65 +48,62 @@ typedef boost::array<unsigned char,6> ethernet_bytes_type; typedef boost::asio::ip::address_v4::bytes_type ipv4_bytes_type; typedef boost::asio::ip::address_v6::bytes_type ipv6_bytes_type; -enum network_address_type_t -{ - ipv4=0, - ipv6=1, - ethernet=2 +enum network_address_type_t { + ipv4=0, + ipv6=1, + ethernet=2 }; class NetworkAddress { public: - NetworkAddress(); - NetworkAddress(const NetworkAddress &); - NetworkAddress(const std::string &); - NetworkAddress(boost::asio::ip::address_v6); - NetworkAddress(boost::asio::ip::address_v4); - NetworkAddress(u_int64_t); - NetworkAddress(const network_address_type_t type, const std::string & address ); - ~NetworkAddress(); - void setNetworkAddress(const network_address_type_t type, const std::string & address ); - void setNetworkAddress(boost::asio::ip::address_v4); - void setNetworkAddress(boost::asio::ip::address_v6); - void setNetworkAddress(u_int64_t); - network_address_type_t getNetworkAddressType() const; + NetworkAddress(); + NetworkAddress(const NetworkAddress&); + NetworkAddress(const std::string&); + NetworkAddress(boost::asio::ip::address_v6); + NetworkAddress(boost::asio::ip::address_v4); + NetworkAddress(u_int64_t); + NetworkAddress(const network_address_type_t type, const std::string& address); + ~NetworkAddress(); + void setNetworkAddress(const network_address_type_t type, const std::string& address); + void setNetworkAddress(boost::asio::ip::address_v4); + void setNetworkAddress(boost::asio::ip::address_v6); + void setNetworkAddress(u_int64_t); + network_address_type_t getNetworkAddressType() const; std::string toString() const; - bool operator<(const NetworkAddress &s) const; - ipv4_bytes_type to_bytes_v4() const; - ipv6_bytes_type to_bytes_v6() const; - ethernet_bytes_type to_bytes_ethernet() const; + bool operator<(const NetworkAddress& s) const; + ipv4_bytes_type to_bytes_v4() const; + ipv6_bytes_type to_bytes_v6() const; + ethernet_bytes_type to_bytes_ethernet() const; const boost::asio::ip::address_v4& getNetworkAddressV4() const; const boost::asio::ip::address_v6& getNetworkAddressV6() const; const u_int64_t getNetworkAdrressEther() const; protected: Mutex mutex_; - boost::asio::ip::address_v4 ipv4_address_; - boost::asio::ip::address_v6 ipv6_address_; - u_int64_t ethernet_address_; - network_address_type_t network_address_type_; + boost::asio::ip::address_v4 ipv4_address_; + boost::asio::ip::address_v6 ipv6_address_; + u_int64_t ethernet_address_; + network_address_type_t network_address_type_; private: - NetworkAddress operator=(const NetworkAddress &s); + NetworkAddress operator=(const NetworkAddress& s); friend class boost::serialization::access; template<class Archive> - void serialize(Archive & ar, const unsigned int version) - { - ar & network_address_type_; - if (network_address_type_==ipv4) - { - std::string ip(ipv4_address_.to_string()); - ar & ip; - ipv4_address_=boost::asio::ip::address_v4::from_string(ip); - } - if (network_address_type_==ipv6) - { - std::string ip(ipv6_address_.to_string()); - ar & ip; - ipv6_address_=boost::asio::ip::address_v6::from_string(ip); - } - if (network_address_type_==ethernet) - ar & ethernet_address_; - } + void serialize(Archive& ar, const unsigned int version) { + ar& network_address_type_; + if(network_address_type_==ipv4) { + std::string ip(ipv4_address_.to_string()); + ar& ip; + ipv4_address_=boost::asio::ip::address_v4::from_string(ip); + } + if(network_address_type_==ipv6) { + std::string ip(ipv6_address_.to_string()); + ar& ip; + ipv6_address_=boost::asio::ip::address_v6::from_string(ip); + } + if(network_address_type_==ethernet) { + ar& ethernet_address_; + } + } }; // for(int i=0;i<4;i++) |