From: dw6 Date: Thu, 4 Dec 2008 10:45:47 +0000 (+0000) Subject: senf::INet4Address::toString() added X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=294845be2d7bd75cd01d269d7fe4ab498f379d1c;p=senf.git senf::INet4Address::toString() added git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@999 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Socket/Protocols/INet/INet4Address.cc b/Socket/Protocols/INet/INet4Address.cc index 043e215..0c100fb 100644 --- a/Socket/Protocols/INet/INet4Address.cc +++ b/Socket/Protocols/INet/INet4Address.cc @@ -89,11 +89,20 @@ prefix_ senf::INet4Address senf::INet4Address::from_string(std::string const & s reinterpret_cast(*(ent->h_addr_list))->s_addr); } +prefix_ std::string senf::INet4Address::toString() const { + char buffer[4*4]; + ::in_addr ina; + ina.s_addr = (*this).inaddr(); + ::inet_ntop(AF_INET, & ina , buffer, sizeof(buffer)); + buffer[sizeof(buffer)-1] = 0; + return buffer; +} + prefix_ bool senf::INet4Address::local() const { address_type l (address()); - return + return (l & 0xFF000000u) == 0x0A000000u || (l & 0xFFF00000u) == 0xAC100000u || (l & 0xFFFF0000u) == 0xA9FE0000u || @@ -147,7 +156,7 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, INet4Address const & char buffer[16]; ina.s_addr = addr.inaddr(); ::inet_ntop(AF_INET,&ina,buffer,16); - buffer[15] = 0; + buffer[15] = 0; os << buffer; return os; } @@ -156,7 +165,7 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, INet4Address const & #undef prefix_ //#include "INet4Address.mpp" - + // Local Variables: // mode: c++ // fill-column: 100 diff --git a/Socket/Protocols/INet/INet4Address.hh b/Socket/Protocols/INet/INet4Address.hh index bfea563..e11982d 100644 --- a/Socket/Protocols/INet/INet4Address.hh +++ b/Socket/Protocols/INet/INet4Address.hh @@ -40,9 +40,9 @@ ///////////////////////////////hh.p//////////////////////////////////////// namespace senf { - + /** \brief IPv4 Internet address - + INet4Address represents a simple IP address. It is modelled as a fixed-size container/sequence of 4 bytes. @@ -50,7 +50,7 @@ namespace senf { \code // Used to construct constant INet4 addresses INet4Address(0xD3C2B1A0) - + // Construct an INet4 address from it's string representation. All the standard address // representations are supported INet4Address::from_string("211.194.177.160") @@ -87,13 +87,13 @@ namespace senf { \ingroup addr_group */ class INet4Address - : public boost::array, + : public boost::array, public comparable_safe_bool { public: /////////////////////////////////////////////////////////////////////////// // Types - + typedef uint32_t address_type; ///< Address representation as number in host byte order typedef uint32_t inaddr_type; ///< Legacy address representation in network byte order @@ -121,8 +121,8 @@ namespace senf { \throws AddressSyntaxException if the address cannot be converted for some reason \param[in] s Address literal or hostname */ - - template + + template static INet4Address from_data(InputIterator i); ///< Construct address from 4 bytes of raw data /**< from_data will build an address from 4 bytes of raw @@ -153,12 +153,14 @@ namespace senf { bool boolean_test() const; ///< \c true, if address is non-empty (!= 0.0.0.0) inaddr_type inaddr() const; ///< Return the raw network byte order address - /**< This member is used to interact with legacy code. + /**< This member is used to interact with legacy code. \return */ address_type address() const; ///< Return address represented as integer number /**< This member returns the address as an integer number in host byte order. This representation allows simple network math operations. */ + std::string toString() const; + ///< get the string representation of this INet4Address ////@} @@ -178,10 +180,10 @@ namespace senf { This helper allows to easily and efficiently check an INet4Address against an arbitrary but constant network prefix. The network prefix is represented by - + \par "" senf::CheckINet4Network< addr , prefix-len > - + Where \a addr is the v4 Internet address as a 32-bit unsigned integer number in host byte order and \a prefix_len is the length of the network prefix. The class exposes a single static member match( addr ) which matches the INet4Address \a addr @@ -206,10 +208,10 @@ namespace senf { /** \brief IPv4 network prefix - This class represents an IPv4 network prefix in CIDR notation. + This class represents an IPv4 network prefix in CIDR notation. */ class INet4Network - : public boost::equality_comparable, + : public boost::equality_comparable, public comparable_safe_bool { public: @@ -231,7 +233,7 @@ namespace senf { bool boolean_test() const; ///< \c true, if INet4Network is non-empty bool operator==(INet4Network const & other) const; ///< Compare to networks for equality - + bool match(INet4Address addr) const; ///< \c true, if the network includes \a addr bool match(INet4Network net) const; ///< \c true, if the network includes \a net /**< The is true, if \a net is sub-network (or the same as) @@ -253,7 +255,7 @@ namespace senf { \code INet4Network("192.168.0.0/16").subnet(111u,24u) == INet4Network("192.168.111.0/24") INet4Network("192.168.111.0/24").subnet(1u,28u) == INet4Network("192.168.111.16/28") - \endcode + \endcode \param[in] net network number \param[in] prefix_len length of subnet prefix */ @@ -270,7 +272,7 @@ namespace senf { \related INet4Network */ std::ostream & operator<<(std::ostream & os, INet4Network const & addr); - + } ///////////////////////////////hh.e//////////////////////////////////////// @@ -279,7 +281,7 @@ namespace senf { #include "INet4Address.cti" #endif - + // Local Variables: // mode: c++ // fill-column: 100