// $Id$
//
// Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
#include <string>
#include <exception>
#include <netinet/in.h>
-#include "Socket/SocketPolicy.hh"
-#include "Socket/ClientSocketHandle.hh"
-#include "Socket/CommunicationPolicy.hh"
-#include "Socket/Protocols/GenericAddressingPolicy.hh"
+#include <boost/operators.hpp>
+#include "../../../Socket/SocketPolicy.hh"
+#include "../../../Socket/ClientSocketHandle.hh"
+#include "../../../Socket/CommunicationPolicy.hh"
+#include "../../../Socket/Protocols/GenericAddressingPolicy.hh"
+#include "../../../Utils/safe_bool.hh"
+#include "INet4Address.hh"
+#include "INet6Address.hh"
//#include "INetAddressing.mpp"
///////////////////////////////hh.p////////////////////////////////////////
namespace senf {
- /// \addtogroup addr_group
- /// @{
-
/** \brief IPv4 socket address
INet4Address wraps the standard sockaddr_in datatype. It provides simple accessor methods
to access the host and port. It does \e not integrate \c gethostbyname or DNS lookup.
+
+ \implementation This implementation is based on sockaddr_in, which is needed since it needs
+ to provide a non-const struct sockaddr * for legacy compatibility.
- \todo Implement real INet4Address datatype and rename this one to INet4SockAddress ...
- \todo Implement more complete interface
- \todo gethostbyname support ?
+ \ingroup addr_group
*/
- class INet4Address
+ class INet4SocketAddress
+ : public boost::equality_comparable<INet4SocketAddress>,
+ public senf::comparable_safe_bool<INet4SocketAddress>
{
public:
- INet4Address();
- INet4Address(char const * address); ///< Set address and port
- /**< See INet4Address(std::string)
- \throws InvalidINetAddressException */
- INet4Address(std::string address); ///< Set address and port
+ INet4SocketAddress();
+ explicit INet4SocketAddress(std::string const & addr); ///< Set address and port
/**< This constructor expects a string of the form
- 'xxx.xxx.xxx.xxx:pppp'. The constructor will use this
- value to initialize the host and port members. This
- constructor does \e only support numeric ip addresses
- not hostnames
- \param[in] address Address and port
- \throws InvalidINetAddressException */
- INet4Address(std::string host, unsigned port); ///< Set address and port explicitly
- /**< \param[in] host ip address in dotted-quad notation
- \param[in] port port number
- \throws InvalidINetAddressException */
+ 'host:port'. The constructor will use this value to
+ initialize the host and port members. Since it uses the
+ INet4Address::from_string constructor, this call may
+ block while waiting for the resolver.
+ \throws SyntaxException if the address syntax is
+ invalid
+ \throws INet4Address::UnknownHostnameException if the
+ address cannot be resolved. */
+
+ INet4SocketAddress(INet4Address const & addr, unsigned port);
+ ///< Set address and port explicitly
+ /**< \param[in] addr IP address
+ \param[in] port port number */
+ bool operator==(INet4SocketAddress const & other) const;
+ ///< Check INet4SocketAddress for equality
- bool operator==(INet4Address const & other) const; ///< Check INet4Address for equality
+ INet4Address address() const; ///< Return address
+ unsigned port() const; ///< Return port number
- std::string str() const; ///< Return "address:port" string
- std::string host() const; ///< Return address in doted quad notation
- unsigned port() const; ///< Return portnumber
+ bool boolean_test() const; ///< \c true, if address is not empty (i.e. 0.0.0.0:0)
void clear(); ///< Clear address/port to 0.0.0.0:0
+ void address(INet4Address const & addr); ///< Set address
+ void port(unsigned p); ///< Set port number
+
/// \name Generic Address Interface
/// @{
/// @}
- private:
- void assignString(std::string addr);
+ struct SyntaxException : public std::exception
+ { virtual char const * what() const throw()
+ { return "Invalid IPv4 socket address syntax"; } };
+ private:
struct ::sockaddr_in addr_;
};
/** \brief Write address and port to os
- \related INet4Address
- */
- std::ostream & operator<<(std::ostream & os, INet4Address const & addr);
-
- /** \brief IPv6 network address
-
- INet6Address represents a 128bit IPv6 network address. This class supports all standard
- numeric string representations of IPv6 addresses. This class does not integrate with \c
- gethostbyname() and so does not support host names.
-
- The conversion constructors allow the use of string constants wherever an INet6Address is
- expected. Especially, it is possible to assign a string to an address to change it's value.
-
- \implementation The <tt>char const *</tt> constructor overload is needed to support
- string-literals where an INet6Address is expected (the C++ standard does not allow
- chaining conversion constructors like char const * -> std::string -> INet6Address)
- */
- class INet6Address
- {
- public:
- ///////////////////////////////////////////////////////////////////////////
- // Types
-
- ///////////////////////////////////////////////////////////////////////////
- ///\name Structors and default members
- ///@{
-
- INet6Address(); ///< Create empty address
- INet6Address(std::string const & addr); ///< Create address from string representation
- INet6Address(char const * addr); ///< Create address from string representation
- INet6Address(struct in6_addr const & addr); ///< Create address from in6_addr
- template <class Range>
- explicit INet6Address(Range const & range); ///< Create address from arbitrary raw data
- /**< This constructor will copy 16 bytes from the given
- range and interpret them as a IPv6 address in network
- byte order. This constructor is used to read an
- arbitrary address from it's binary representation.
-
- \param range arbitrary range, see <a
- href="http://www.boost.org/libs/range/index.html">Boost.Range</a>
- */
-
- ///@}
- ///////////////////////////////////////////////////////////////////////////
-
- void clear(); ///< Clear address
- std::string address() const; ///< Return printable address representation
-
- bool operator==(INet6Address const & other) const; ///< Compare addresses for equality
- bool operator!=(INet6Address const & other) const; ///< Inverse of above
-
- struct in6_addr & addr(); ///< Access internal address representation
- struct in6_addr const & addr() const;
- ///< Access internal address representation in const context
- struct in6_addr * addr_p(); ///< Get pointer to internal address repr
- struct in6_addr const * addr_p() const;
- ///< Get const pointer to internal address repr
- unsigned addr_len() const; ///< Size of an IPv6 address (16 bytes)
-
- protected:
-
- private:
- struct in6_addr addr_;
- };
-
-
- /** \brief Output INet6Address instance as it's string representation
+ \related INet4SocketAddress
*/
- std::ostream & operator<<(std::ostream & os, INet6Address const & addr);
+ std::ostream & operator<<(std::ostream & os, INet4SocketAddress const & addr);
/** \brief IPv6 socket address
This class wraps the standard \c sockaddr_in6 structure. INet6SocketAddress provides access
to all members of the sockaddr_in6 structure. Additionally, INet6SocketAddress supports the
- string representation
-
- \par "" <tt>[</tt> <i>address</i> [ <tt>\@</tt> <i>interface</i> ] <tt>]:</tt> <i>port</i>
+ string representations
- Where \e address is an arbitrary numeric IPv6 address, \e interface is an optional network
- interface name and \e port is the port number. The interface specification is only valid if
- \e address is link-local address. The URL representation of an IPv6 address is as above
- without the optional interface spec.
+ \par ""
+ <tt>[</tt> <i>address</i> [ <tt>%</tt> <i>zone-id</i> ] <tt>]:</tt> <i>port</i> \n
+ <i>hostname</i> <tt>:</tt> <i>port</i>
- INet6SocketAddress supports conversion constructors from it's string
- representation. Therefore, wherever a INet6SocketAddress instance is expected, a string may
- be used instead.
+ Where \e address is an arbitrary numeric IPv6 address, \e zone-id is an optional network
+ interface name and \e port is the port number. So some example addresses are
+
+ \par ""
+ <tt>[2001:db8:1::1]:80</tt> \n
+ <tt>www.6bone.net:80</tt> \n
+ <tt>[fe80::1\%eth0]:443</tt>
\implementation The sockaddr_in6 structure has an sin6_flowinfo member. However RFC3493 does
not give the use of this field and specifies, that the field should be ignored ... so
that's what we do. Furthermore, the GNU libc reference states, that this field is not
implemented in the library.
- \implementation We need to return the address in host() by value since we need to return a
- INet6Address. However, sockaddr_in6 does not have one ...
-
- \implementation The <tt>char const *</tt> constructor overload is needed to support
- string-literals where an INet6SocketAddress is expected (the C++ standard does not allow
- chaining conversion constructors like <tt>char const *</tt> -> \c std::string -> \c
- INet6SocketAddress)
-
\idea Implement a INet6Address_ref class which has an interface identical to INet6Address
- and is convertible to INet6Address (the latter has a conversion constructor taking the
- former as arg). This class however references an external in6_addr instead of containing one
- itself. This can be used in INet6SocketAddress to increase the performance of some
- operations.
+ and is convertible to INet6Address (the latter has a conversion constructor taking the
+ former as arg). This class however references an external in6_addr instead of containing
+ one itself. This can be used in INet6SocketAddress to increase the performance of some
+ operations.
+
+ \ingroup addr_group
*/
class INet6SocketAddress
{
///@{
INet6SocketAddress(); ///< Create empty instance
- INet6SocketAddress(std::string const & addr);
+ explicit INet6SocketAddress(std::string const & addr,
+ INet6Address::Resolve_t resolve = INet6Address::ResolveINet6);
///< Initialize/convert from string representation
- INet6SocketAddress(char const * addr); ///< Same as above to support string literals
+ /**< \throws SyntaxException if the address syntax is
+ invalid
+ \throws INet6Address::UnknownHostnameException if the
+ address cannot be resolved.
+ \param[in] addr Address to parse
+ \param[in] resolve If this is
+ INet6Address::ResolveINet4, support IPv4
+ addresses. See INet6Address. */
INet6SocketAddress(INet6Address const & addr, unsigned port);
///< Initialize from address and port
INet6SocketAddress(INet6Address const & addr, unsigned port, std::string const & iface);
///< Initialize explicitly from given parameters
- INet6SocketAddress(std::string const & addr, std::string const & iface);
- ///< Initialize from URL representation and explit interface
///@}
///////////////////////////////////////////////////////////////////////////
void clear(); ///< Clear socket address
- std::string address() const; ///< Get printable address representation
+ INet6Address address() const; ///< Get printable address representation
- INet6Address host() const; ///< Get address
- void host(INet6Address const & addr); ///< Change address
+ void address(INet6Address const & addr); ///< Change address
unsigned port() const; ///< Get port number
void port(unsigned poirt); ///< Change port number
///@}
+ struct SyntaxException : public std::exception
+ { virtual char const * what() const throw()
+ { return "Invalid IPv6 socket address syntax"; } };
+
protected:
private:
- void assignAddr(std::string const & addr);
void assignIface(std::string const & iface);
struct sockaddr_in6 sockaddr_;
};
/** \brief Output INet6SocketAddress instance as it's string representation
+ \related INet6SocketAddress
*/
std::ostream & operator<<(std::ostream & os, INet6SocketAddress const & addr);
- /** \brief Signal invalid INet address syntax
-
- \related INet4Address
- \relatesalso INet6Address
- */
- struct InvalidINetAddressException : public std::exception
- { char const * what() const throw() { return "invalid inet address"; } };
-
- /// @}
-
/// \addtogroup policy_impl_group
/// @{
*/
struct INet4AddressingPolicy
: public AddressingPolicyBase,
- private GenericAddressingPolicy<INet4Address>
+ private GenericAddressingPolicy<INet4SocketAddress>
{
- typedef INet4Address Address;
+ typedef INet4SocketAddress Address;
- using GenericAddressingPolicy<INet4Address>::peer;
- using GenericAddressingPolicy<INet4Address>::local;
- using GenericAddressingPolicy<INet4Address>::connect;
- using GenericAddressingPolicy<INet4Address>::bind;
+ using GenericAddressingPolicy<INet4SocketAddress>::peer;
+ using GenericAddressingPolicy<INet4SocketAddress>::local;
+ using GenericAddressingPolicy<INet4SocketAddress>::connect;
+ using GenericAddressingPolicy<INet4SocketAddress>::bind;
};
/** \brief Addressing policy supporting IPv6 addressing
///////////////////////////////hh.e////////////////////////////////////////
#include "INetAddressing.cci"
-#include "INetAddressing.ct"
+//#include "INetAddressing.ct"
//#include "INetAddressing.cti"
//#include "INetAddressing.mpp"
#endif
projects / senf.git / blobdiff