tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved Get*Address() functions to Socket class.

This commit is contained in:
Gunnar Beutner 2012-04-27 11:44:05 +02:00
parent c1a8576c5c
commit db25f7f353
4 changed files with 46 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
base/socket.cpp
View File

@ -105,3 +105,44 @@ bool Socket::WantsToWrite(void) const
{
return false;
}
string Socket::GetAddressFromSockaddr(sockaddr *address, socklen_t len)
{
char host[NI_MAXHOST];
char service[NI_MAXSERV];
if (getnameinfo(address, len, host, sizeof(host), service, sizeof(service), NI_NUMERICHOST | NI_NUMERICSERV) < 0)
throw InvalidArgumentException(); /* TODO: throw proper exception */
stringstream s;
s << "[" << host << "]:" << service;
return s.str();
}
string Socket::GetClientAddress(void)
{
sockaddr_storage sin;
socklen_t len = sizeof(sin);
if (getsockname(GetFD(), (sockaddr *)&sin, &len) < 0) {
HandleSocketError();
return string();
}
return GetAddressFromSockaddr((sockaddr *)&sin, len);
}
string Socket::GetPeerAddress(void)
{
sockaddr_storage sin;
socklen_t len = sizeof(sin);
if (getpeername(GetFD(), (sockaddr *)&sin, &len) < 0) {
HandleSocketError();
return string();
}
return GetAddressFromSockaddr((sockaddr *)&sin, len);
}

5
base/socket.h
View File

@ -19,6 +19,8 @@ private:
int ExceptionEventHandler(const EventArgs& ea);
static string GetAddressFromSockaddr(sockaddr *address, socklen_t len);
protected:
Socket(void);
@ -52,6 +54,9 @@ public:
virtual void Stop(void);
void Close(void);
string GetClientAddress(void);
string GetPeerAddress(void);
};
}

42
base/tcpsocket.cpp
View File

@ -78,45 +78,3 @@ void TCPSocket::Bind(const char *hostname, unsigned short port, int family)
freeaddrinfo(result);
}
string TCPSocket::GetAddressFromSockaddr(sockaddr *address, socklen_t len)
{
char host[NI_MAXHOST];
char service[NI_MAXSERV];
if (getnameinfo(address, len, host, sizeof(host), service, sizeof(service), NI_NUMERICHOST | NI_NUMERICSERV) < 0)
throw InvalidArgumentException(); /* TODO: throw proper exception */
stringstream s;
s << "[" << host << "]:" << service;
return s.str();
}
string TCPSocket::GetClientAddress(void)
{
sockaddr_storage sin;
socklen_t len = sizeof(sin);
if (getsockname(GetFD(), (sockaddr *)&sin, &len) < 0) {
HandleSocketError();
return string();
}
return GetAddressFromSockaddr((sockaddr *)&sin, len);
}
string TCPSocket::GetPeerAddress(void)
{
sockaddr_storage sin;
socklen_t len = sizeof(sin);
if (getpeername(GetFD(), (sockaddr *)&sin, &len) < 0) {
HandleSocketError();
return string();
}
return GetAddressFromSockaddr((sockaddr *)&sin, len);
}

8
base/tcpsocket.h
View File

@ -7,8 +7,6 @@ namespace icinga
class I2_BASE_API TCPSocket : public Socket
{
private:
static string GetAddressFromSockaddr(sockaddr *address, socklen_t len);
void MakeSocket(int family);
public:
@ -17,12 +15,6 @@ public:
void Bind(unsigned short port, int family);
void Bind(const char *hostname, unsigned short port, int family);
bool GetClientSockaddr(sockaddr_storage *address);
bool GetPeerSockaddr(sockaddr_storage *address);
string GetClientAddress(void);
string GetPeerAddress(void);
};
}