[Box Backup-commit] COMMIT r2253 - box/trunk/lib/server
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Thu Aug 21 12:04:21 BST 2008
Author: chris
Date: 2008-08-21 12:04:21 +0100 (Thu, 21 Aug 2008)
New Revision: 2253
Modified:
box/trunk/lib/server/Socket.cpp
box/trunk/lib/server/Socket.h
box/trunk/lib/server/SocketStream.cpp
box/trunk/lib/server/SocketStream.h
box/trunk/lib/server/SocketStreamTLS.cpp
box/trunk/lib/server/SocketStreamTLS.h
Log:
Make Open() take a const std::string& for the socket name instead of a
const char *, for C++ style.
Modified: box/trunk/lib/server/Socket.cpp
===================================================================
--- box/trunk/lib/server/Socket.cpp 2008-08-21 11:02:24 UTC (rev 2252)
+++ box/trunk/lib/server/Socket.cpp 2008-08-21 11:04:21 UTC (rev 2253)
@@ -37,7 +37,8 @@
// Created: 2003/07/31
//
// --------------------------------------------------------------------------
-void Socket::NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain, int Type, const char *Name, int Port, int &rSockAddrLenOut)
+void Socket::NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain,
+ int Type, const std::string& rName, int Port, int &rSockAddrLenOut)
{
int sockAddrLen = 0;
@@ -47,7 +48,7 @@
sockDomain = AF_INET;
{
// Lookup hostname
- struct hostent *phost = ::gethostbyname(Name);
+ struct hostent *phost = ::gethostbyname(rName.c_str());
if(phost != NULL)
{
if(phost->h_addr_list[0] != 0)
@@ -81,7 +82,7 @@
sockDomain = AF_UNIX;
{
// Check length of name is OK
- unsigned int nameLen = ::strlen(Name);
+ unsigned int nameLen = rName.length();
if(nameLen >= (sizeof(addr.sa_unix.sun_path) - 1))
{
THROW_EXCEPTION(ServerException, SocketNameUNIXPathTooLong);
@@ -91,7 +92,7 @@
addr.sa_unix.sun_len = sockAddrLen;
#endif
addr.sa_unix.sun_family = PF_UNIX;
- ::strcpy(addr.sa_unix.sun_path, Name);
+ ::strcpy(addr.sa_unix.sun_path, rName.c_str());
}
break;
#endif
Modified: box/trunk/lib/server/Socket.h
===================================================================
--- box/trunk/lib/server/Socket.h 2008-08-21 11:02:24 UTC (rev 2252)
+++ box/trunk/lib/server/Socket.h 2008-08-21 11:04:21 UTC (rev 2253)
@@ -45,7 +45,9 @@
TypeUNIX = 2
};
- void NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain, int Type, const char *Name, int Port, int &rSockAddrLenOut);
+ void NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain,
+ int Type, const std::string& rName, int Port,
+ int &rSockAddrLenOut);
void LogIncomingConnection(const struct sockaddr *addr, socklen_t addrlen);
std::string IncomingConnectionLogMessage(const struct sockaddr *addr, socklen_t addrlen);
};
Modified: box/trunk/lib/server/SocketStream.cpp
===================================================================
--- box/trunk/lib/server/SocketStream.cpp 2008-08-21 11:02:24 UTC (rev 2252)
+++ box/trunk/lib/server/SocketStream.cpp 2008-08-21 11:04:21 UTC (rev 2253)
@@ -136,7 +136,7 @@
// Created: 2003/07/31
//
// --------------------------------------------------------------------------
-void SocketStream::Open(int Type, const char *Name, int Port)
+void SocketStream::Open(int Type, const std::string& rName, int Port)
{
if(mSocketHandle != INVALID_SOCKET_VALUE)
{
@@ -147,7 +147,7 @@
int sockDomain = 0;
SocketAllAddr addr;
int addrLen = 0;
- Socket::NameLookupToSockAddr(addr, sockDomain, Type, Name, Port, addrLen);
+ Socket::NameLookupToSockAddr(addr, sockDomain, Type, rName, Port, addrLen);
// Create the socket
mSocketHandle = ::socket(sockDomain, SOCK_STREAM,
@@ -166,11 +166,11 @@
DWORD err = WSAGetLastError();
::closesocket(mSocketHandle);
BOX_LOG_WIN_ERROR_NUMBER("Failed to connect to socket "
- "(type " << Type << ", name " << Name <<
+ "(type " << Type << ", name " << rName <<
", port " << Port << ")", err);
#else // !WIN32
BOX_LOG_SYS_ERROR("Failed to connect to socket (type " <<
- Type << ", name " << Name << ", port " << Port <<
+ Type << ", name " << rName << ", port " << Port <<
")");
::close(mSocketHandle);
#endif // WIN32
Modified: box/trunk/lib/server/SocketStream.h
===================================================================
--- box/trunk/lib/server/SocketStream.h 2008-08-21 11:02:24 UTC (rev 2252)
+++ box/trunk/lib/server/SocketStream.h 2008-08-21 11:04:21 UTC (rev 2253)
@@ -36,7 +36,7 @@
SocketStream(const SocketStream &rToCopy);
~SocketStream();
- void Open(int Type, const char *Name, int Port = 0);
+ void Open(int Type, const std::string& rName, int Port = 0);
void Attach(int socket);
virtual int Read(void *pBuffer, int NBytes, int Timeout = IOStream::TimeOutInfinite);
Modified: box/trunk/lib/server/SocketStreamTLS.cpp
===================================================================
--- box/trunk/lib/server/SocketStreamTLS.cpp 2008-08-21 11:02:24 UTC (rev 2252)
+++ box/trunk/lib/server/SocketStreamTLS.cpp 2008-08-21 11:04:21 UTC (rev 2253)
@@ -99,9 +99,10 @@
// Created: 2003/08/06
//
// --------------------------------------------------------------------------
-void SocketStreamTLS::Open(const TLSContext &rContext, int Type, const char *Name, int Port)
+void SocketStreamTLS::Open(const TLSContext &rContext, int Type,
+ const std::string& rName, int Port)
{
- SocketStream::Open(Type, Name, Port);
+ SocketStream::Open(Type, rName, Port);
Handshake(rContext);
ResetCounters();
}
Modified: box/trunk/lib/server/SocketStreamTLS.h
===================================================================
--- box/trunk/lib/server/SocketStreamTLS.h 2008-08-21 11:02:24 UTC (rev 2252)
+++ box/trunk/lib/server/SocketStreamTLS.h 2008-08-21 11:04:21 UTC (rev 2253)
@@ -38,7 +38,8 @@
SocketStreamTLS(const SocketStreamTLS &rToCopy);
public:
- void Open(const TLSContext &rContext, int Type, const char *Name, int Port = 0);
+ void Open(const TLSContext &rContext, int Type,
+ const std::string& rName, int Port = 0);
void Handshake(const TLSContext &rContext, bool IsServer = false);
virtual int Read(void *pBuffer, int NBytes, int Timeout = IOStream::TimeOutInfinite);
More information about the Boxbackup-commit
mailing list