diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2014-11-02 17:21:42 +1000 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-11-02 02:27:26 -0500 |
| commit | 209c0dd1af7b1b26fbaa4bc36e8c57f755fb222b (patch) | |
| tree | e2917121d9e16beb02b24d35ce04a2d324153906 /src/socket.h | |
| parent | dfd15fd1d90a89b6cd66ce42fb4e93d7292b8298 (diff) | |
| download | minetest-209c0dd1af7b1b26fbaa4bc36e8c57f755fb222b.tar.gz minetest-209c0dd1af7b1b26fbaa4bc36e8c57f755fb222b.tar.bz2 minetest-209c0dd1af7b1b26fbaa4bc36e8c57f755fb222b.zip | |
Fix unit tests failing if IPv6 not available
See:
https://github.com/minetest/minetest/issues/1526
https://github.com/minetest/minetest/issues/793
Diffstat (limited to 'src/socket.h')
| -rw-r--r-- | src/socket.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/socket.h b/src/socket.h index 92e0cbb13..c7dd78f66 100644 --- a/src/socket.h +++ b/src/socket.h @@ -85,16 +85,16 @@ public: 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==(Address &address); - bool operator!=(Address &address); + 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); struct sockaddr_in getAddress() const; unsigned short getPort() const; void setAddress(u32 address); void setAddress(u8 a, u8 b, u8 c, u8 d); - void setAddress(const IPv6AddressBytes * ipv6_bytes); + void setAddress(const IPv6AddressBytes *ipv6_bytes); struct sockaddr_in6 getAddress6() const; int getFamily() const; bool isIPv6() const; @@ -115,9 +115,13 @@ private: class UDPSocket { public: + UDPSocket() { } UDPSocket(bool ipv6); ~UDPSocket(); 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); |