// $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 <sys/socket.h>
#include <net/if.h>
#include <boost/lexical_cast.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/range.hpp>
+#include <boost/regex.hpp>
+#include "../../../Utils/senfassert.hh"
//#include "INetAddressing.mpp"
#define prefix_
prefix_ senf::INet4SocketAddress::INet4SocketAddress(std::string const & addr)
{
clear();
- unsigned i = addr.find(':');
- if (i == std::string::npos)
- throw SyntaxException();
- address(INet4Address::from_string(std::string(addr,0,i)));
+ unsigned 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)
///////////////////////////////////////////////////////////////////////////
// senf::INet6SocketAddress
+prefix_ senf::INet6SocketAddress::INet6SocketAddress(std::string const & addr,
+ INet6Address::Resolve_t resolve)
+{
+ clear();
+
+ // Format of addr: "[" address [ "%" interface ] "]" ":" port
+ // or: host ":" port
+ // or: port
+
+ static boost::regex const addressRx ("(?:(?:\\[([a-f0-9A-F:]+)(?:%(.+))?\\]|(.+)):)?([0-9]+)");
+ // Subexpression numbers:
+ enum { NumericAddr = 1,
+ ZoneId = 2,
+ Hostname = 3,
+ Port = 4 };
+
+ boost::smatch match;
+ if (! regex_match(addr, match, addressRx))
+ throw AddressSyntaxException();
+
+ if (match[ZoneId].matched)
+ assignIface(match[ZoneId]);
+
+ sockaddr_.sin6_port = htons(boost::lexical_cast<boost::uint16_t>(match[Port]));
+
+ if (match[NumericAddr].matched || match[Hostname].matched) {
+ INet6Address a (INet6Address::from_string(
+ match[NumericAddr].matched ? match[NumericAddr] : match[Hostname],
+ resolve));
+ std::copy(a.begin(), a.end(), &sockaddr_.sin6_addr.s6_addr[0]);
+ }
+}
+
prefix_ bool senf::INet6SocketAddress::operator==(INet6SocketAddress const & other)
const
{
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();
-}
-
prefix_ std::string senf::INet6SocketAddress::iface()
const
{
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<char> separator;
- typedef boost::tokenizer<separator> 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<unsigned>(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())
else {
sockaddr_.sin6_scope_id = if_nametoindex(iface.c_str());
if (sockaddr_.sin6_scope_id == 0)
- throw SyntaxException();
+ throw AddressSyntaxException();
}
}
projects / senf.git / blobdiff