diff options
Diffstat (limited to 'lib/server/Socket.cpp')
| -rw-r--r-- | lib/server/Socket.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/lib/server/Socket.cpp b/lib/server/Socket.cpp index 4a83bdb0..69a11330 100644 --- a/lib/server/Socket.cpp +++ b/lib/server/Socket.cpp @@ -123,6 +123,7 @@ void Socket::NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain, // -------------------------------------------------------------------------- void Socket::LogIncomingConnection(const struct sockaddr *addr, socklen_t addrlen) { +<<<<<<< HEAD if(addr == NULL) {THROW_EXCEPTION(CommonException, BadArguments)} switch(addr->sa_family) @@ -144,6 +145,10 @@ void Socket::LogIncomingConnection(const struct sockaddr *addr, socklen_t addrle BOX_WARNING("Incoming connection of unknown type"); break; } +======= + BOX_INFO("Incoming connection from " << + IncomingConnectionLogMessage(addr, addrlen)); +>>>>>>> 0.12 } // -------------------------------------------------------------------------- @@ -161,20 +166,40 @@ std::string Socket::IncomingConnectionLogMessage(const struct sockaddr *addr, so switch(addr->sa_family) { case AF_UNIX: +<<<<<<< HEAD return std::string("Incoming connection from local (UNIX socket)"); +======= + return std::string("local (UNIX socket)"); +>>>>>>> 0.12 break; case AF_INET: { +<<<<<<< HEAD char msg[256]; // more than enough sockaddr_in *a = (sockaddr_in*)addr; sprintf(msg, "Incoming connection from %s port %d", inet_ntoa(a->sin_addr), ntohs(a->sin_port)); return std::string(msg); +======= + sockaddr_in *a = (sockaddr_in*)addr; + std::ostringstream oss; + oss << inet_ntoa(a->sin_addr) << " port " << + ntohs(a->sin_port); + return oss.str(); +>>>>>>> 0.12 } break; default: +<<<<<<< HEAD return std::string("Incoming connection of unknown type"); +======= + { + std::ostringstream oss; + oss << "unknown socket type " << addr->sa_family; + return oss.str(); + } +>>>>>>> 0.12 break; } |