Use the append function from string utilities

[libs/net.git] / source / net / inet6.cpp

diff --git a/source/net/inet6.cpp b/source/net/inet6.cpp
index 79da1d2269316e2ab0931f738b2fd160f6d3b773..da584d4880ebd43dda084565fa90233b0a0792cb 100644 (file)
--- a/source/net/inet6.cpp
+++ b/source/net/inet6.cpp
@@ -1,11 +1,7 @@
-#ifdef WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <msp/strings/format.h>
 #include "inet6.h"
+#include "platform_api.h"
+#include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "sockaddr_private.h"
 
 using namespace std;
@@ -13,12 +9,6 @@ using namespace std;
 namespace Msp {
 namespace Net {
 
-Inet6Addr::Inet6Addr():
-       port(0)
-{
-       fill(addr, addr+16, 0);
-}
-
 Inet6Addr::Inet6Addr(const SysAddr &sa)
 {
        const sockaddr_in6 &sai6 = reinterpret_cast<const sockaddr_in6 &>(sa.addr);
@@ -45,9 +35,9 @@ string Inet6Addr::str() const
        string result = "[";
        for(unsigned i=0; i<16; i+=2)
        {
-               unsigned short part = (addr[i]<<8) | addr[i+1];
                if(i>0)
                        result += ':';
+               unsigned short part = (addr[i]<<8) | addr[i+1];
                result += format("%x", part);
        }
        result += ']';