hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit

Browse source
This commit is contained in:
Erik Zandvliet 2011-08-01 21:20:53 +02:00
commit cad02ccc8e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
util/socket.cpp
View file

@ -404,19 +404,19 @@ Socket::Connection Socket::Server::accept(bool nonblock){
if (addrinfo.sin6_family == AF_INET6){ if (addrinfo.sin6_family == AF_INET6){
tmp.remotehost = inet_ntop(AF_INET6, &(addrinfo.sin6_addr), addrconv, INET6_ADDRSTRLEN); tmp.remotehost = inet_ntop(AF_INET6, &(addrinfo.sin6_addr), addrconv, INET6_ADDRSTRLEN);
#if DEBUG >= 4 #if DEBUG >= 4
printf("IPv6 addr: %s\n", tmp.remotehost.c_str()); fprintf(stderr,"IPv6 addr: %s\n", tmp.remotehost.c_str());
#endif #endif
} }
if (addrinfo.sin6_family == AF_INET){ if (addrinfo.sin6_family == AF_INET){
tmp.remotehost = inet_ntop(AF_INET, &(((sockaddr_in*)&addrinfo)->sin_addr), addrconv, INET6_ADDRSTRLEN); tmp.remotehost = inet_ntop(AF_INET, &(((sockaddr_in*)&addrinfo)->sin_addr), addrconv, INET6_ADDRSTRLEN);
#if DEBUG >= 4 #if DEBUG >= 4
printf("IPv4 addr: %s\n", tmp.remotehost.c_str()); fprintf(stderr,"IPv4 addr: %s\n", tmp.remotehost.c_str());
#endif #endif
} }
if (addrinfo.sin6_family == AF_UNIX){ if (addrinfo.sin6_family == AF_UNIX){
#if DEBUG >= 4 #if DEBUG >= 4
tmp.remotehost = ((sockaddr_un*)&addrinfo)->sun_path; tmp.remotehost = ((sockaddr_un*)&addrinfo)->sun_path;
printf("Unix addr: %s\n", tmp.remotehost.c_str()); fprintf(stderr,"Unix addr: %s\n", tmp.remotehost.c_str());
#endif #endif
tmp.remotehost = "UNIX_SOCKET"; tmp.remotehost = "UNIX_SOCKET";
} }