Optimize headers (part 2) (#6272)

[minetest.git] / src / socket.h

diff --git a/src/socket.h b/src/socket.h
index 994a07e45b3b712fe983a12c10869554cf6c0d6a..489818123b61c7927651b6acfd1a4c7fe763c719 100644 (file)
--- a/src/socket.h
+++ b/src/socket.h
@@ -17,10 +17,23 @@ 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
+#pragma once
+
+#ifdef _WIN32
+#ifndef _WIN32_WINNT
+       #define _WIN32_WINNT 0x0501
+#endif
+       #include <windows.h>
+       #include <winsock2.h>
+       #include <ws2tcpip.h>
+#else
+       #include <sys/socket.h>
+       #include <netinet/in.h>
+#endif
 
 #include <ostream>
+#include <string.h>
+#include "irrlichttypes.h"
 #include "exceptions.h"
 
 extern bool socket_enable_debug_output;
@@ -28,7 +41,7 @@ extern bool socket_enable_debug_output;
 class SocketException : public BaseException
 {
 public:
-       SocketException(const char *s):
+       SocketException(const std::string &s):
                BaseException(s)
        {
        }
@@ -37,7 +50,7 @@ class SocketException : public BaseException
 class ResolveError : public BaseException
 {
 public:
-       ResolveError(const char *s):
+       ResolveError(const std::string &s):
                BaseException(s)
        {
        }
@@ -46,7 +59,7 @@ class ResolveError : public BaseException
 class SendFailedException : public BaseException
 {
 public:
-       SendFailedException(const char *s):
+       SendFailedException(const std::string &s):
                BaseException(s)
        {
        }
@@ -55,37 +68,56 @@ class SendFailedException : public BaseException
 void sockets_init();
 void sockets_cleanup();
 
+class IPv6AddressBytes
+{
+public:
+       u8 bytes[16];
+       IPv6AddressBytes() { memset(bytes, 0, 16); }
+};
+
 class Address
 {
 public:
        Address();
-       Address(unsigned int address, unsigned short port);
-       Address(unsigned int a, unsigned int b,
-                       unsigned int c, unsigned int d,
-                       unsigned short port);
-       bool operator==(Address &address);
-       bool operator!=(Address &address);
+       Address(u32 address, u16 port);
+       Address(u8 a, u8 b, u8 c, u8 d, u16 port);
+       Address(const IPv6AddressBytes *ipv6_bytes, u16 port);
+       bool operator==(const Address &address);
+       bool operator!=(const Address &address);
+       // Resolve() may throw ResolveError (address is unchanged in this case)
        void Resolve(const char *name);
-       unsigned int getAddress() const;
+       struct sockaddr_in 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 setAddress(u32 address);
+       void setAddress(u8 a, u8 b, u8 c, u8 d);
+       void setAddress(const IPv6AddressBytes *ipv6_bytes);
+       struct sockaddr_in6 getAddress6() const;
+       int getFamily() const;
+       bool isIPv6() const;
+       bool isZero() const;
        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;
+       unsigned int m_addr_family = 0;
+       union
+       {
+               struct sockaddr_in  ipv4;
+               struct sockaddr_in6 ipv6;
+       } m_address;
+       u16 m_port = 0; // Port is separate from sockaddr structures
 };
 
 class UDPSocket
 {
 public:
-       UDPSocket();
+       UDPSocket() { }
+       UDPSocket(bool ipv6);
        ~UDPSocket();
-       void Bind(unsigned short port);
+       void Bind(Address addr);
+
+       bool init(bool ipv6, bool noExceptions = false);
+
        //void Close();
        //bool IsOpen();
        void Send(const Address & destination, const void * data, int size);
@@ -98,7 +130,5 @@ class UDPSocket
 private:
        int m_handle;
        int m_timeout_ms;
+       int m_addr_family;
 };
-
-#endif
-