Network/HostnameInfo: Replace family/socketType raw value by engine enumeration

Former-commit-id: 40adb7654b5a741c5fa12c1b866e3b427b1be5e9
This commit is contained in:
Lynix
2015-11-14 02:12:10 +01:00
parent 1b4ac70ac3
commit e8aa649cfc
10 changed files with 70 additions and 18 deletions

View File

@@ -30,8 +30,9 @@ namespace Nz
NetProtocol_Any,
NetProtocol_IPv4,
NetProtocol_IPv6,
NetProtocol_Unknown,
NetProtocol_Max = NetProtocol_IPv6
NetProtocol_Max = NetProtocol_Unknown
};
enum SocketError
@@ -71,8 +72,9 @@ namespace Nz
SocketType_Raw,
SocketType_TCP,
SocketType_UDP,
SocketType_Unknown,
SocketType_Max = SocketType_UDP
SocketType_Max = SocketType_Unknown
};
}

View File

@@ -89,10 +89,9 @@ namespace Nz
struct HostnameInfo
{
IpAddress address;
NetProtocol protocol;
SocketType socketType;
String canonicalName;
int flags;
int family; //< TODO: NetProtocol
int socketType; //< TODO: SocketType
};
}

View File

@@ -118,6 +118,7 @@ namespace Nz
switch (first.m_protocol)
{
case NetProtocol_Any:
case NetProtocol_Unknown:
break;
case NetProtocol_IPv4:
@@ -167,6 +168,7 @@ namespace Nz
switch (first.m_protocol)
{
case NetProtocol_Any:
case NetProtocol_Unknown:
break;
case NetProtocol_IPv4:

View File

@@ -31,11 +31,13 @@ namespace Nz
inline SocketState TcpServer::Listen(NetProtocol protocol, UInt16 port, unsigned int queueSize)
{
NazaraAssert(protocol != NetProtocol_Any, "Any protocol not supported for Listen"); //< TODO
NazaraAssert(protocol != NetProtocol_Unknown, "Invalid protocol");
IpAddress any;
switch (protocol)
{
case NetProtocol_Any:
case NetProtocol_Unknown:
NazaraInternalError("Invalid protocol Any at this point");
return SocketState_NotConnected;

View File

@@ -30,6 +30,7 @@ namespace Nz
switch (m_protocol)
{
case NetProtocol_Any:
case NetProtocol_Unknown:
NazaraInternalError("Invalid protocol Any at this point");
return SocketState_NotConnected;
@@ -48,6 +49,8 @@ namespace Nz
bool UdpSocket::Create(NetProtocol protocol)
{
NazaraAssert(protocol != NetProtocol_Unknown, "Invalid protocol");
return Open(protocol);
}