Merge remote-tracking branch 'speedprog/banByIp'

[dragonfireclient.git] / src / socket.h

diff --git a/src/socket.h b/src/socket.h
index 10bcdefee825c2a96a08fd4841318d38680e6c53..f24947c2785b10341d361514e989f52c12c9c617 100644 (file)
--- a/src/socket.h
+++ b/src/socket.h
@@ -30,11 +30,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #include <winsock2.h>
        #include <ws2tcpip.h>
        #ifdef _MSC_VER
-               #pragma comment(lib, "wsock32.lib")
+               #pragma comment(lib, "ws2_32.lib")
        #endif
 typedef SOCKET socket_t;
 typedef int socklen_t;
 #else
+       #include <sys/types.h>
        #include <sys/socket.h>
        #include <netinet/in.h>
        #include <fcntl.h>
@@ -96,6 +97,7 @@ class Address
        void setPort(unsigned short port);
        void print(std::ostream *s) const;
        void print() const;
+       std::string serializeString();
 private:
        unsigned int m_address;
        unsigned short m_port;