X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FINetAddressing.cc;h=fdb4ee1564da4614eabbbee8b8e2fd979adb3aca;hb=26d3a25e9afa95c1daff06878a29e45cf811d18b;hp=d768c7d1d3e6a817586512acae865b8e96ea5c85;hpb=ca133fb5d47ad2bd90d95e21626df59fdd78571a;p=senf.git diff --git a/Socket/Protocols/INet/INetAddressing.cc b/Socket/Protocols/INet/INetAddressing.cc index d768c7d..fdb4ee1 100644 --- a/Socket/Protocols/INet/INetAddressing.cc +++ b/Socket/Protocols/INet/INetAddressing.cc @@ -1,9 +1,9 @@ // $Id$ // // Copyright (C) 2006 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) -// Stefan Bund +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Stefan Bund // // 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 @@ -33,116 +33,77 @@ #include #include #include -#include -#include +#include +#include "../../../Utils/senfassert.hh" //#include "INetAddressing.mpp" #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// -// senf::INet4Address +// senf::INet4SocketAddress prefix_ senf::INet4SocketAddress::INet4SocketAddress(std::string const & addr) + : BSDSocketAddress (sizeof(sockaddr_in), AF_INET) { - clear(); - unsigned i = addr.find(':'); - if (i == std::string::npos) - throw SyntaxException(); - address(INet4Address::from_string(std::string(addr,0,i))); + std::string::size_type portIx = addr.find(':'); try { - port(boost::lexical_cast< ::u_int16_t >(std::string(addr,i+1))); + port( boost::lexical_cast< ::u_int16_t >(portIx == std::string::npos + ? addr : std::string(addr,portIx+1)) ); } catch (boost::bad_lexical_cast const &) { - throw SyntaxException(); + throw AddressSyntaxException() << "invalid port number"; } + if (portIx != std::string::npos) + address( INet4Address::from_string(std::string(addr,0,portIx)) ); } prefix_ senf::INet4SocketAddress::INet4SocketAddress(INet4Address const & addr, unsigned p) + : BSDSocketAddress (sizeof(sockaddr_in), AF_INET) { - clear(); address(addr); port(p); } -prefix_ void senf::INet4SocketAddress::clear() +prefix_ senf::INet4SocketAddress::INet4SocketAddress(unsigned p) + : BSDSocketAddress (sizeof(sockaddr_in), AF_INET) { - ::memset(&addr_,0,sizeof(addr_)); - addr_.sin_family = AF_INET; + port(p); } /////////////////////////////////////////////////////////////////////////// -// senf::INet6Address +// senf::INet6SocketAddress -prefix_ senf::INet6Address::INet6Address(std::string const & addr) +prefix_ senf::INet6SocketAddress::INet6SocketAddress(std::string const & addr, + INet6Address::Resolve_t resolve) + : BSDSocketAddress (sizeof(sockaddr_in6), AF_INET6) { - if (inet_pton(AF_INET6,addr.c_str(),&addr_) <= 0) - throw SyntaxException(); -} + // Format of addr: "[" address [ "%" interface ] "]" ":" port + // or: host ":" port + // or: port -prefix_ senf::INet6Address::INet6Address(char const * addr) -{ - if (inet_pton(AF_INET6,addr,&addr_) <= 0) - throw SyntaxException(); -} + static boost::regex const addressRx ("(?:(?:\\[([^%]+)(?:%(.+))?\\]|(.+)):)?([0-9]+)"); + // Subexpression numbers: + enum { Address = 1, + ZoneId = 2, + Hostname = 3, + Port = 4 }; -prefix_ void senf::INet6Address::clear() -{ - ::memset(&addr_,0,sizeof(addr_)); -} + boost::smatch match; + if (! regex_match(addr, match, addressRx)) + throw AddressSyntaxException(); -prefix_ std::string senf::INet6Address::address() - const -{ - char buffer[8*5]; - BOOST_ASSERT( inet_ntop(AF_INET6, &addr_, buffer, sizeof(buffer)) ); - return std::string(buffer); -} + if (match[ZoneId].matched) + assignIface(match[ZoneId]); -prefix_ bool senf::INet6Address::operator==(INet6Address const & other) - const -{ - return ::memcmp(&addr_,&other.addr_,sizeof(addr_))==0; -} - -prefix_ bool senf::INet6Address::operator!=(INet6Address const & other) - const -{ - return !operator==(other); -} - -/////////////////////////////////////////////////////////////////////////// -// senf::INet6SocketAddress + sockaddr_.sin6_port = htons(boost::lexical_cast(match[Port])); -prefix_ bool senf::INet6SocketAddress::operator==(INet6SocketAddress const & other) - const -{ - return ::memcmp(&sockaddr_.sin6_addr, &other.sockaddr_.sin6_addr, sizeof(sockaddr_.sin6_addr))==0 && - sockaddr_.sin6_port == other.sockaddr_.sin6_port && - sockaddr_.sin6_scope_id == other.sockaddr_.sin6_scope_id; -} - -prefix_ bool senf::INet6SocketAddress::operator!=(INet6SocketAddress const & other) - const -{ - return ! operator==(other); -} - -prefix_ void senf::INet6SocketAddress::clear() -{ - ::memset(&sockaddr_,0,sizeof(sockaddr_)); - sockaddr_.sin6_family = AF_INET6; -} - -prefix_ std::string senf::INet6SocketAddress::address() - const -{ - std::stringstream ss; - ss << '[' << host(); - if (sockaddr_.sin6_scope_id != 0) - ss << '@' << iface() - << "]:" << port(); - return ss.str(); + if (match[Address].matched || match[Hostname].matched) { + INet6Address a (INet6Address::from_string( + match[Address].matched ? match[Address] : match[Hostname], + resolve)); + std::copy(a.begin(), a.end(), &sockaddr_.sin6_addr.s6_addr[0]); + } } prefix_ std::string senf::INet6SocketAddress::iface() @@ -151,50 +112,14 @@ prefix_ std::string senf::INet6SocketAddress::iface() if (sockaddr_.sin6_scope_id == 0) return ""; char buffer[IFNAMSIZ]; - BOOST_ASSERT( if_indextoname(sockaddr_.sin6_scope_id,buffer) ); +#ifdef SENF_DEBUG + SENF_ASSERT( if_indextoname(sockaddr_.sin6_scope_id,buffer) ); +#else + if_indextoname(sockaddr_.sin6_scope_id,buffer); +#endif return std::string(buffer); } -prefix_ void senf::INet6SocketAddress::assignAddr(std::string const & addr) -{ - // Format of addr: "[" address [ "@" interface ] "]" ":" port - typedef boost::char_separator separator; - typedef boost::tokenizer tokenizer; - // we don't add ':' to the list of separators since that would give as the IPv6 address - // as a list of tokens. We just strip the : from the port number manually - separator sep ("", "@[]"); - tokenizer tokens (addr, sep); - tokenizer::iterator token (tokens.begin()); - if (token == tokens.end() - || *token != "[" - || ++token == tokens.end() - || inet_pton(AF_INET6, std::string(boost::begin(*token),boost::end(*token)).c_str(), - &sockaddr_.sin6_addr) <= 0 - || ++token == tokens.end()) - throw SyntaxException(); - if (*token == "@") { - if (++token == tokens.end()) - throw SyntaxException(); - assignIface(std::string(boost::begin(*token),boost::end(*token))); - if (++token == tokens.end() - || *token != "]") - throw SyntaxException(); - } else if (*token != "]") - throw SyntaxException(); - if (++token == tokens.end() - || *boost::begin(*token) != ':') - throw SyntaxException(); - try { - sockaddr_.sin6_port = htons( - boost::lexical_cast(std::string(boost::next(boost::begin(*token)), - boost::end(*token)))); - } catch(boost::bad_lexical_cast const &) { - throw SyntaxException(); - } - if (++token != tokens.end()) - throw SyntaxException(); -} - prefix_ void senf::INet6SocketAddress::assignIface(std::string const & iface) { if (iface.empty()) @@ -202,7 +127,7 @@ prefix_ void senf::INet6SocketAddress::assignIface(std::string const & iface) else { sockaddr_.sin6_scope_id = if_nametoindex(iface.c_str()); if (sockaddr_.sin6_scope_id == 0) - throw SyntaxException(); + throw AddressSyntaxException(); } } @@ -210,7 +135,7 @@ prefix_ void senf::INet6SocketAddress::assignIface(std::string const & iface) #undef prefix_ //#include "INetAddressing.mpp" - + // Local Variables: // mode: c++ // fill-column: 100