X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINetAddressing.cc;h=fe9d648fb38fd30fd9f0c041d113fb9e3a040c37;hb=99c145da3884f5c20a74337927ef2cbc073d80d7;hp=aead331b741176a980f13acac9c7009f002cd22d;hpb=5bd0f0d58ba30d95a02b46fc9122a7e981bcbcad;p=senf.git diff --git a/senf/Socket/Protocols/INet/INetAddressing.cc b/senf/Socket/Protocols/INet/INetAddressing.cc index aead331..fe9d648 100644 --- a/senf/Socket/Protocols/INet/INetAddressing.cc +++ b/senf/Socket/Protocols/INet/INetAddressing.cc @@ -39,9 +39,9 @@ //#include "INetAddressing.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::INet4SocketAddress prefix_ senf::INet4SocketAddress::INet4SocketAddress(std::string const & addr) @@ -92,7 +92,7 @@ prefix_ std::istream & senf::operator>>(std::istream & is, INet4SocketAddress & return is; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::INet6SocketAddress prefix_ senf::INet6SocketAddress::INet6SocketAddress(std::string const & addr, @@ -133,11 +133,8 @@ prefix_ std::string senf::INet6SocketAddress::iface() 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); } @@ -176,7 +173,7 @@ prefix_ std::istream & senf::operator>>(std::istream & is, INet6SocketAddress & return is; } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "INetAddressing.mpp"