X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FINetAddressing.cc;h=6bc79e581978f01b66c7b740666b7c7ef0fa1f9a;hb=d2459b6c8249291588fd3d0d125ed3d38e003b55;hp=b0cb9624bea76ed8895b641ed833e4b7f5615eef;hpb=7a4d13b962b9cd20e2e0bad0753a9bb1ca3219c4;p=senf.git

diff --git a/Socket/Protocols/INet/INetAddressing.cc b/Socket/Protocols/INet/INetAddressing.cc
index b0cb962..6bc79e5 100644
--- a/Socket/Protocols/INet/INetAddressing.cc
+++ b/Socket/Protocols/INet/INetAddressing.cc
@@ -46,16 +46,16 @@
 prefix_ senf::INet4SocketAddress::INet4SocketAddress(std::string const & addr)
 {
     clear();
-    unsigned i = addr.find(':');
-    if (i == std::string::npos)
-        throw AddressSyntaxException();
+    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 AddressSyntaxException();
+        throw AddressSyntaxException() << "invalid port number";
     }
-    address(INet4Address::from_string(std::string(addr,0,i)));
+    if (portIx != std::string::npos)
+        address( INet4Address::from_string(std::string(addr,0,portIx)) );
 }
 
 prefix_ senf::INet4SocketAddress::INet4SocketAddress(INet4Address const & addr, unsigned p)
@@ -81,8 +81,9 @@ prefix_ senf::INet6SocketAddress::INet6SocketAddress(std::string const & addr,
 
     // Format of addr: "[" address [ "%" interface ] "]" ":" port
     //             or: host ":" port
+    //             or: port
 
-    static boost::regex const addressRx ("(?:\\[([a-f0-9A-F:]+)(?:%(.+))?\\]|(.+)):([0-9]+)");
+    static boost::regex const addressRx ("(?:(?:\\[([a-f0-9A-F:]+)(?:%(.+))?\\]|(.+)):)?([0-9]+)");
     // Subexpression numbers:
     enum { NumericAddr = 1,
            ZoneId      = 2,
@@ -98,10 +99,12 @@ prefix_ senf::INet6SocketAddress::INet6SocketAddress(std::string const & addr,
 
     sockaddr_.sin6_port = htons(boost::lexical_cast<boost::uint16_t>(match[Port]));
 
-    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]);
+    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)
@@ -112,12 +115,6 @@ prefix_ bool senf::INet6SocketAddress::operator==(INet6SocketAddress const & oth
         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_));