X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finet.cpp;h=cb34263fc1de38230edcae058ca014ba671e5858;hb=2aab4004e71a2e5c773289e0be5e58aec6a8d339;hp=181c73403cfa3606731d384abb90a056953f07b4;hpb=f59eded7c3e162bbdfc6db424c9badc730017698;p=libs%2Fnet.git diff --git a/source/inet.cpp b/source/inet.cpp index 181c734..cb34263 100644 --- a/source/inet.cpp +++ b/source/inet.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspnet -Copyright © 2008 Mikkosoft Productions, Mikko Rasa -Distributed under the LGPL -*/ - #include #include "inet.h" @@ -18,7 +11,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 +24,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