Changeset 2424

Timestamp:

03/01/2009 08:56:13 (3 years ago)

Author:

chris

Message:

Change use of int to identify a socket type to the proper enum.

Location:

box/trunk/lib/server

Files:

• Socket.cpp (modified) (2 diffs)
• Socket.h (modified) (2 diffs)
• SocketListen.h (modified) (1 diff)
• SocketStream.h (modified) (2 diffs)
• SocketStreamTLS.cpp (modified) (1 diff)

box/trunk/lib/server/Socket.cpp

@@ -33 +33 @@
 //
 // 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
@@ -39 +40 @@
 // --------------------------------------------------------------------------
 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;

box/trunk/lib/server/Socket.h

@@ -40 +40 @@
 namespace Socket
 {
-        enum
+        enum Type
         {
                 TypeINET = 1,
@@ -47 +47 @@
 
         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);

box/trunk/lib/server/SocketListen.h

@@ -126 +126 @@
         //
         // ------------------------------------------------------------------
-        void Listen(int Type, const char *Name, int Port = 0)
+        void Listen(Socket::Type Type, const char *Name, int Port = 0)
         {
                 if(mSocketHandle != -1)

box/trunk/lib/server/SocketStream.h

@@ -12 +12 @@
 
 #include "IOStream.h"
+#include "Socket.h"
 
 #ifdef WIN32
@@ -37 +38 @@
         ~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);
 

box/trunk/lib/server/SocketStreamTLS.cpp

@@ -100 +100 @@
 //
 // --------------------------------------------------------------------------
-void SocketStreamTLS::Open(const TLSContext &rContext, int Type,
+void SocketStreamTLS::Open(const TLSContext &rContext, Socket::Type Type,
         const std::string& rName, int Port)
 {