luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 00:55:20 +02:00
Code Activity

Fix unit tests failing if IPv6 not available

Browse Source 
See:
https://github.com/minetest/minetest/issues/1526
https://github.com/minetest/minetest/issues/793
This commit is contained in:
Craig Robbins
2014-11-02 17:21:42 +10:00
committed by kwolekr
parent dfd15fd1d9
commit 209c0dd1af
3 changed files with 124 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/socket.h
View File

@@ -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);