? addr : std::string(addr,portIx+1)) );
}
catch (boost::bad_lexical_cast const &) {
- throw AddressSyntaxException() << "invalid port number";
+ throw AddressSyntaxException(addr) << ": invalid port number";
}
if (portIx != std::string::npos)
address( INet4Address::from_string(std::string(addr,0,portIx)) );
boost::smatch match;
if (! regex_match(addr, match, addressRx))
- throw AddressSyntaxException();
+ throw AddressSyntaxException(addr);
if (match[ZoneId].matched)
assignIface(match[ZoneId]);
if (sockaddr_.sin6_scope_id == 0)
return "";
char buffer[IFNAMSIZ];
-#ifdef SENF_DEBUG
- SENF_ASSERT( if_indextoname(sockaddr_.sin6_scope_id,buffer) );
-#else
- if_indextoname(sockaddr_.sin6_scope_id,buffer);
-#endif
+ SENF_ASSERT_EXPRESSION(if_indextoname(sockaddr_.sin6_scope_id,buffer),
+ "Internal failure: Invalid interface index (how does it get here?)");
return std::string(buffer);
}
else {
sockaddr_.sin6_scope_id = if_nametoindex(iface.c_str());
if (sockaddr_.sin6_scope_id == 0)
- throw AddressSyntaxException();
+ throw AddressSyntaxException(iface);
}
}