[Box Backup-commit] COMMIT r2424 - box/trunk/lib/server

[boxbackup-dev@boxbackup.org]

Author: chris
Date: 2009-01-03 08:56:13 +0000 (Sat, 03 Jan 2009)
New Revision: 2424

Modified:
   box/trunk/lib/server/Socket.cpp
   box/trunk/lib/server/Socket.h
   box/trunk/lib/server/SocketListen.h
   box/trunk/lib/server/SocketStream.h
   box/trunk/lib/server/SocketStreamTLS.cpp
Log:
Change use of int to identify a socket type to the proper enum.


Modified: box/trunk/lib/server/Socket.cpp
===================================================================
--- box/trunk/lib/server/Socket.cpp	2009-01-03 04:21:28 UTC (rev 2423)
+++ box/trunk/lib/server/Socket.cpp	2009-01-03 08:56:13 UTC (rev 2424)
@@ -32,13 +32,15 @@
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    Socket::NameLookupToSockAddr(SocketAllAddr &, int, char *, int)
+//		Name:    Socket::NameLookupToSockAddr(SocketAllAddr &, int,
+//			 char *, int)
 //		Purpose: Sets up a sockaddr structure given a name and type
 //		Created: 2003/07/31
 //
 // --------------------------------------------------------------------------
 void Socket::NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain,
-	int Type, const std::string& rName, int Port, int &rSockAddrLenOut)
+	enum Type Type, const std::string& rName, int Port,
+	int &rSockAddrLenOut)
 {
 	int sockAddrLen = 0;
 

Modified: box/trunk/lib/server/Socket.h
===================================================================
--- box/trunk/lib/server/Socket.h	2009-01-03 04:21:28 UTC (rev 2423)
+++ box/trunk/lib/server/Socket.h	2009-01-03 08:56:13 UTC (rev 2424)
@@ -39,14 +39,14 @@
 // --------------------------------------------------------------------------
 namespace Socket
 {
-	enum
+	enum Type
 	{
 		TypeINET = 1,
 		TypeUNIX = 2
 	};
 
 	void NameLookupToSockAddr(SocketAllAddr &addr, int &sockDomain,
-		int Type, const std::string& rName, int Port,
+		enum Type 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/SocketListen.h
===================================================================
--- box/trunk/lib/server/SocketListen.h	2009-01-03 04:21:28 UTC (rev 2423)
+++ box/trunk/lib/server/SocketListen.h	2009-01-03 08:56:13 UTC (rev 2424)
@@ -125,7 +125,7 @@
 	//		Created: 2003/07/31
 	//
 	// ------------------------------------------------------------------
-	void Listen(int Type, const char *Name, int Port = 0)
+	void Listen(Socket::Type Type, const char *Name, int Port = 0)
 	{
 		if(mSocketHandle != -1)
 		{

Modified: box/trunk/lib/server/SocketStream.h
===================================================================
--- box/trunk/lib/server/SocketStream.h	2009-01-03 04:21:28 UTC (rev 2423)
+++ box/trunk/lib/server/SocketStream.h	2009-01-03 08:56:13 UTC (rev 2424)
@@ -11,6 +11,7 @@
 #define SOCKETSTREAM__H
 
 #include "IOStream.h"
+#include "Socket.h"
 
 #ifdef WIN32
 	typedef SOCKET tOSSocketHandle;
@@ -36,7 +37,7 @@
 	SocketStream(const SocketStream &rToCopy);
 	~SocketStream();
 	
-	void Open(int Type, const std::string& rName, int Port = 0);
+	void Open(Socket::Type 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	2009-01-03 04:21:28 UTC (rev 2423)
+++ box/trunk/lib/server/SocketStreamTLS.cpp	2009-01-03 08:56:13 UTC (rev 2424)
@@ -99,7 +99,7 @@
 //		Created: 2003/08/06
 //
 // --------------------------------------------------------------------------
-void SocketStreamTLS::Open(const TLSContext &rContext, int Type,
+void SocketStreamTLS::Open(const TLSContext &rContext, Socket::Type Type,
 	const std::string& rName, int Port)
 {
 	SocketStream::Open(Type, rName, Port);