Made unknown nodes stop falling nodes properly and shorten lines

[dragonfireclient.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index c1517ccb922b8d5ce3a94bc008f9e908ea934a33..1c07c44d5839e350b0913ef04bd7a6faec55b743 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -56,6 +56,7 @@ typedef int socket_t;
 #include <string.h>
 #include <errno.h>
 #include <sstream>
+#include <iomanip>
 #include "util/string.h"
 #include "util/numeric.h"
 
@@ -185,6 +186,8 @@ void Address::Resolve(const char *name)
 // IP address -> textual representation
 std::string Address::serializeString() const
 {
+// windows XP doesnt have inet_ntop, maybe use better func
+#ifdef _WIN32
        if(m_addr_family == AF_INET)
        {
                u8 a, b, c, d, addr;
@@ -201,8 +204,8 @@ std::string Address::serializeString() const
                for(int i = 0; i < 16; i += 2)
                {
                        u16 section =
-                               (m_address.ipv6.sin6_addr.s6_addr[i] << 8) |
-                               (m_address.ipv6.sin6_addr.s6_addr[i + 1]);
+                       (m_address.ipv6.sin6_addr.s6_addr[i] << 8) |
+                       (m_address.ipv6.sin6_addr.s6_addr[i + 1]);
                        os << std::hex << section;
                        if(i < 14)
                                os << ":";
@@ -211,6 +214,13 @@ std::string Address::serializeString() const
        }
        else
                return std::string("");
+#else
+       char str[INET6_ADDRSTRLEN];
+       if (inet_ntop(m_addr_family, (m_addr_family == AF_INET) ? (void*)&(m_address.ipv4.sin_addr) : (void*)&(m_address.ipv6.sin6_addr), str, INET6_ADDRSTRLEN) == NULL) {
+               return std::string("");
+       }
+       return std::string(str);
+#endif
 }
 
 struct sockaddr_in Address::getAddress() const
@@ -383,9 +393,10 @@ void UDPSocket::Send(const Address & destination, const void * data, int size)
                for(int i = 0; i < size && i < 20; i++)
                {
                        if(i % 2 == 0)
-                               DEBUGPRINT(" ");
+                               dstream << " ";
                        unsigned int a = ((const unsigned char *) data)[i];
-                       DEBUGPRINT("%.2X", a);
+                       dstream << std::hex << std::setw(2) << std::setfill('0')
+                               << a;
                }
                
                if(size > 20)
@@ -485,9 +496,10 @@ int UDPSocket::Receive(Address & sender, void * data, int size)
                for(int i = 0; i < received && i < 20; i++)
                {
                        if(i % 2 == 0)
-                               DEBUGPRINT(" ");
+                               dstream << " ";
                        unsigned int a = ((const unsigned char *) data)[i];
-                       DEBUGPRINT("%.2X", a);
+                       dstream << std::hex << std::setw(2) << std::setfill('0')
+                               << a;
                }
                if(received > 20)
                        dstream << "...";