Changeset 2253
- Timestamp:
- 21/08/2008 12:04:21 (3 months ago)
- Files:
-
- box/trunk/lib/server/Socket.cpp (modified) (4 diffs)
- box/trunk/lib/server/Socket.h (modified) (1 diff)
- box/trunk/lib/server/SocketStream.cpp (modified) (3 diffs)
- box/trunk/lib/server/SocketStream.h (modified) (1 diff)
- box/trunk/lib/server/SocketStreamTLS.cpp (modified) (1 diff)
- box/trunk/lib/server/SocketStreamTLS.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
box/trunk/lib/server/Socket.cpp
r1783 r2253 38 38 // 39 39 // -------------------------------------------------------------------------- 40 void Socket::NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain, int Type, const char *Name, int Port, int &rSockAddrLenOut) 40 void Socket::NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain, 41 int Type, const std::string& rName, int Port, int &rSockAddrLenOut) 41 42 { 42 43 int sockAddrLen = 0; … … 48 49 { 49 50 // Lookup hostname 50 struct hostent *phost = ::gethostbyname( Name);51 struct hostent *phost = ::gethostbyname(rName.c_str()); 51 52 if(phost != NULL) 52 53 { … … 82 83 { 83 84 // Check length of name is OK 84 unsigned int nameLen = ::strlen(Name);85 unsigned int nameLen = rName.length(); 85 86 if(nameLen >= (sizeof(addr.sa_unix.sun_path) - 1)) 86 87 { … … 92 93 #endif 93 94 addr.sa_unix.sun_family = PF_UNIX; 94 ::strcpy(addr.sa_unix.sun_path, Name);95 ::strcpy(addr.sa_unix.sun_path, rName.c_str()); 95 96 } 96 97 break; box/trunk/lib/server/Socket.h
r217 r2253 46 46 }; 47 47 48 void NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain, int Type, const char *Name, int Port, int &rSockAddrLenOut); 48 void NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain, 49 int Type, const std::string& rName, int Port, 50 int &rSockAddrLenOut); 49 51 void LogIncomingConnection(const struct sockaddr *addr, socklen_t addrlen); 50 52 std::string IncomingConnectionLogMessage(const struct sockaddr *addr, socklen_t addrlen); box/trunk/lib/server/SocketStream.cpp
r2127 r2253 137 137 // 138 138 // -------------------------------------------------------------------------- 139 void SocketStream::Open(int Type, const char *Name, int Port)139 void SocketStream::Open(int Type, const std::string& rName, int Port) 140 140 { 141 141 if(mSocketHandle != INVALID_SOCKET_VALUE) … … 148 148 SocketAllAddr addr; 149 149 int addrLen = 0; 150 Socket::NameLookupToSockAddr(addr, sockDomain, Type, Name, Port, addrLen);150 Socket::NameLookupToSockAddr(addr, sockDomain, Type, rName, Port, addrLen); 151 151 152 152 // Create the socket … … 167 167 ::closesocket(mSocketHandle); 168 168 BOX_LOG_WIN_ERROR_NUMBER("Failed to connect to socket " 169 "(type " << Type << ", name " << Name <<169 "(type " << Type << ", name " << rName << 170 170 ", port " << Port << ")", err); 171 171 #else // !WIN32 172 172 BOX_LOG_SYS_ERROR("Failed to connect to socket (type " << 173 Type << ", name " << Name << ", port " << Port <<173 Type << ", name " << rName << ", port " << Port << 174 174 ")"); 175 175 ::close(mSocketHandle); box/trunk/lib/server/SocketStream.h
r1085 r2253 37 37 ~SocketStream(); 38 38 39 void Open(int Type, const char *Name, int Port = 0);39 void Open(int Type, const std::string& rName, int Port = 0); 40 40 void Attach(int socket); 41 41 box/trunk/lib/server/SocketStreamTLS.cpp
r2090 r2253 100 100 // 101 101 // -------------------------------------------------------------------------- 102 void SocketStreamTLS::Open(const TLSContext &rContext, int Type, const char *Name, int Port) 103 { 104 SocketStream::Open(Type, Name, Port); 102 void SocketStreamTLS::Open(const TLSContext &rContext, int Type, 103 const std::string& rName, int Port) 104 { 105 SocketStream::Open(Type, rName, Port); 105 106 Handshake(rContext); 106 107 ResetCounters(); box/trunk/lib/server/SocketStreamTLS.h
r217 r2253 39 39 public: 40 40 41 void Open(const TLSContext &rContext, int Type, const char *Name, int Port = 0); 41 void Open(const TLSContext &rContext, int Type, 42 const std::string& rName, int Port = 0); 42 43 void Handshake(const TLSContext &rContext, bool IsServer = false); 43 44
