// $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
}
///////////////////////////////////////////////////////////////////////////
-// senf::INet6Address
-
-prefix_ senf::INet6Address::INet6Address()
-{
- clear();
-}
-
-prefix_ senf::INet6Address::INet6Address(struct in6_addr const & addr)
-{
- addr_ = addr;
-}
-
-prefix_ struct in6_addr & senf::INet6Address::addr()
-{
- return addr_;
-}
-
-prefix_ struct in6_addr const & senf::INet6Address::addr()
- const
-{
- return addr_;
-}
-
-prefix_ struct in6_addr * senf::INet6Address::addr_p()
-{
- return & addr_;
-}
-
-prefix_ struct in6_addr const * senf::INet6Address::addr_p()
- const
-{
- return & addr_;
-}
-
-prefix_ unsigned senf::INet6Address::addr_len()
- const
-{
- return sizeof(addr_);
-}
-
-prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6Address const & addr)
-{
- os << addr.address();
- return os;
-}
-
-///////////////////////////////////////////////////////////////////////////
// senf::INet6SocketAddress
prefix_ senf::INet6SocketAddress::INet6SocketAddress()
clear();
}
-prefix_ senf::INet6SocketAddress::INet6SocketAddress(std::string const & addr)
-{
- clear();
- assignAddr(addr);
-}
-
-prefix_ senf::INet6SocketAddress::INet6SocketAddress(char const * addr)
-{
- clear();
- assignAddr(addr);
-}
-
prefix_ senf::INet6SocketAddress::INet6SocketAddress(INet6Address const & addr, unsigned port)
{
clear();
- sockaddr_.sin6_addr = addr.addr();
+ std::copy(addr.begin(), addr.end(), &sockaddr_.sin6_addr.s6_addr[0]);
sockaddr_.sin6_port = htons(port);
}
std::string const & iface)
{
clear();
- sockaddr_.sin6_addr = addr.addr();
+ std::copy(addr.begin(), addr.end(), &sockaddr_.sin6_addr.s6_addr[0]);
sockaddr_.sin6_port = htons(port);
assignIface(iface);
}
-prefix_ senf::INet6SocketAddress::INet6SocketAddress(std::string const & addr,
- std::string const & iface)
-{
- clear();
- assignAddr(addr);
- assignIface(iface);
-}
-
-prefix_ senf::INet6Address senf::INet6SocketAddress::host()
+prefix_ senf::INet6Address senf::INet6SocketAddress::address()
const
{
- return INet6Address(sockaddr_.sin6_addr);
+ return INet6Address::from_data(&sockaddr_.sin6_addr.s6_addr[0]);
}
-prefix_ void senf::INet6SocketAddress::host(INet6Address const & addr)
+prefix_ void senf::INet6SocketAddress::address(INet6Address const & addr)
{
- sockaddr_.sin6_addr = addr.addr();
+ std::copy(addr.begin(), addr.end(), &sockaddr_.sin6_addr.s6_addr[0]);
}
prefix_ unsigned senf::INet6SocketAddress::port()
prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6SocketAddress const & addr)
{
- os << addr.address();
+ os << '[' << addr.address();
+ std::string iface (addr.iface());
+ if (! iface.empty())
+ os << '%' << iface;
+ os << "]:" << addr.port();
return os;
}