fixed documentation for mcLoop

[senf.git] / Socket / Protocols / INet / INetAddressing.cc

diff --git a/Socket/Protocols/INet/INetAddressing.cc b/Socket/Protocols/INet/INetAddressing.cc
index d4f1149..dd5d6e1 100644 (file)
--- a/Socket/Protocols/INet/INetAddressing.cc
+++ b/Socket/Protocols/INet/INetAddressing.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// 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
@@ -48,19 +48,14 @@ prefix_ senf::INet4SocketAddress::INet4SocketAddress(std::string const & addr)
     clear();
     unsigned i = addr.find(':');
     if (i == std::string::npos)
-        throw SyntaxException();
+        throw AddressSyntaxException();
     try {
         port(boost::lexical_cast< ::u_int16_t >(std::string(addr,i+1)));
     }
     catch (boost::bad_lexical_cast const &) {
-        throw SyntaxException();
-    }
-    try {
-        address(INet4Address::from_string(std::string(addr,0,i)));
-    }
-    catch (INet4Address::SyntaxException const &) {
-        throw SyntaxException();
+        throw AddressSyntaxException();
     }
+    address(INet4Address::from_string(std::string(addr,0,i)));
 }
 
 prefix_ senf::INet4SocketAddress::INet4SocketAddress(INet4Address const & addr, unsigned p)
@@ -96,21 +91,17 @@ prefix_ senf::INet6SocketAddress::INet6SocketAddress(std::string const & addr,
     
     boost::smatch match;
     if (! regex_match(addr, match, addressRx))
-        throw SyntaxException();
+        throw AddressSyntaxException();
 
     if (match[ZoneId].matched)
         assignIface(match[ZoneId]);
 
     sockaddr_.sin6_port = htons(boost::lexical_cast<boost::uint16_t>(match[Port]));
 
-    try {
-        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]);
-    } catch (INet6Address::SyntaxException const &) {
-          throw SyntaxException();
-    }
+    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)
@@ -154,7 +145,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();
     }
 }