Tool definition transfer to client

[minetest.git] / src / socket.h

diff --git a/src/socket.h b/src/socket.h
index 1cbed91cf3b120ab71413a8143ec0f3411a194bd..74b5fb64391173c6142ccbd95c3e3bd3606022f7 100644 (file)
--- a/src/socket.h
+++ b/src/socket.h
@@ -1,15 +1,41 @@
+/*
+Minetest-c55
+Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #ifndef SOCKET_HEADER
 #define SOCKET_HEADER
 
 #ifdef _WIN32
        #define WIN32_LEAN_AND_MEAN
+       // Without this some of the network functions are not found on mingw
+       #ifndef _WIN32_WINNT
+               #define _WIN32_WINNT 0x0501
+       #endif
        #include <windows.h>
        #include <winsock2.h>
        #include <ws2tcpip.h>
-       #pragma comment(lib, "wsock32.lib")
+       #ifdef _MSC_VER
+               #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>
@@ -66,9 +92,12 @@ class Address
        unsigned int getAddress() const;
        unsigned short getPort() const;
        void setAddress(unsigned int address);
+       void setAddress(unsigned int a, unsigned int b,
+                       unsigned int c, unsigned int d);
        void setPort(unsigned short port);
        void print(std::ostream *s) const;
        void print() const;
+       std::string serializeString() const;
 private:
        unsigned int m_address;
        unsigned short m_port;