tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 23:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

More gcc build fixes.

Browse Source
This commit is contained in:
Gunnar Beutner 2012-04-26 16:55:26 +02:00
parent e34045b307
commit c01477ff62
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
base/tcpsocket.cpp
View File

@ -41,10 +41,10 @@ void TCPSocket::Bind(const char *hostname, unsigned short port)
string TCPSocket::GetAddressFromSockaddr(sockaddr *address) string TCPSocket::GetAddressFromSockaddr(sockaddr *address)
{ {
static char Buffer[256]; static char buffer[256];
#ifdef _WIN32 #ifdef _WIN32
DWORD BufferLength = sizeof(Buffer); DWORD BufferLength = sizeof(buffer);
socklen_t len; socklen_t len;
if (address->sa_family == AF_INET) if (address->sa_family == AF_INET)
@ -57,24 +57,21 @@ string TCPSocket::GetAddressFromSockaddr(sockaddr *address)
return ""; return "";
} }
if (WSAAddressToString(address, len, NULL, Buffer, &BufferLength) != 0) { if (WSAAddressToString(address, len, NULL, buffer, &BufferLength) != 0)
return NULL; return string();
}
#else /* _WIN32 */ #else /* _WIN32 */
void *IpAddress; void *IpAddress;
if (Address->sa_family == AF_INET) { if (address->sa_family == AF_INET)
IpAddress = &(((sockaddr_in *)Address)->sin_addr); IpAddress = &(((sockaddr_in *)address)->sin_addr);
} else { else
IpAddress = &(((sockaddr_in6 *)Address)->sin6_addr); IpAddress = &(((sockaddr_in6 *)address)->sin6_addr);
}
if (inet_ntop(Address->sa_family, IpAddress, Buffer, sizeof(Buffer)) == NULL) { if (inet_ntop(address->sa_family, address, buffer, sizeof(buffer)) == NULL)
return NULL; return string();
}
#endif /* _WIN32 */ #endif /* _WIN32 */
return Buffer; return buffer;
} }
unsigned short TCPSocket::GetPortFromSockaddr(sockaddr *address) unsigned short TCPSocket::GetPortFromSockaddr(sockaddr *address)