X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Finet.cpp;h=57d8085cd299f0fb2bb72e5a932652adf69e214f;hp=181c73403cfa3606731d384abb90a056953f07b4;hb=1b2aabf076169e6d2049227188e464e95ac40514;hpb=35009eb3f51a6fd0f9261f892a85d97d81e69886 diff --git a/source/inet.cpp b/source/inet.cpp index 181c734..57d8085 100644 --- a/source/inet.cpp +++ b/source/inet.cpp @@ -1,7 +1,7 @@ /* $Id$ This file is part of libmspnet -Copyright © 2008 Mikkosoft Productions, Mikko Rasa +Copyright © 2008, 2011 Mikkosoft Productions, Mikko Rasa Distributed under the LGPL */ @@ -18,7 +18,7 @@ InetAddr::InetAddr(): port(0) { } -InetAddr::InetAddr(sockaddr_in &sa): +InetAddr::InetAddr(const sockaddr_in &sa): addr(sa.sin_addr.s_addr), port(sa.sin_port) { } @@ -31,7 +31,10 @@ InetAddr::InetAddr(in_addr_t a, in_port_t p): string InetAddr::str() const { const unsigned char *ptr=reinterpret_cast(&addr); - return format("%d.%d.%d.%d:%d", static_cast(ptr[0]), static_cast(ptr[1]), static_cast(ptr[2]), static_cast(ptr[3]), ntohs(port)); + string result = format("%d.%d.%d.%d", ptr[0], ptr[1], ptr[2], ptr[3]); + if(port) + result += format(":%d", ntohs(port)); + return result; } unsigned InetAddr::fill_sockaddr(sockaddr &sa) const