Changeset 3049

Timestamp:

13/12/2011 00:43:41 (5 months ago)

Author:

chris

Message:

Add remote host and port to post-login login message, requested by Pete Jalajas.

Location:

box/trunk

Files:

• bin/bbstored/BackupStoreDaemon.cpp (modified) (1 diff)
• lib/backupstore/BackupCommands.cpp (modified) (1 diff)
• lib/backupstore/BackupStoreContext.cpp (modified) (1 diff)
• lib/backupstore/BackupStoreContext.h (modified) (3 diffs)
• lib/server/ServerStream.h (modified) (5 diffs)
• lib/server/Socket.cpp (modified) (2 diffs)

box/trunk/bin/bbstored/BackupStoreDaemon.cpp

@@ -330 +330 @@
 
         // Create a context, using this ID
-        BackupStoreContext context(id, *this);
+        BackupStoreContext context(id, *this, GetConnectionDetails());
 
         if (mpTestHook)

box/trunk/lib/backupstore/BackupCommands.cpp

@@ -132 +132 @@
                 "(name=" << rContext.GetAccountName() << "): " <<
                 (((mFlags & Flags_ReadOnly) != Flags_ReadOnly)
-                ?"Read/Write":"Read-only"));
+                        ?"Read/Write":"Read-only") << " from " <<
+                rContext.GetConnectionDetails());
 
         // Get the usage info for reporting to the client

box/trunk/lib/backupstore/BackupStoreContext.cpp

@@ -55 +55 @@
 // --------------------------------------------------------------------------
 BackupStoreContext::BackupStoreContext(int32_t ClientID,
-        HousekeepingInterface &rDaemon)
-        : mClientID(ClientID),
+        HousekeepingInterface &rDaemon, const std::string& rConnectionDetails)
+        : mConnectionDetails(rConnectionDetails),
+          mClientID(ClientID),
           mrDaemon(rDaemon),
           mProtocolPhase(Phase_START),

box/trunk/lib/backupstore/BackupStoreContext.h

@@ -46 +46 @@
 {
 public:
-        BackupStoreContext(int32_t ClientID, HousekeepingInterface &rDaemon);
+        BackupStoreContext(int32_t ClientID, HousekeepingInterface &rDaemon,
+                const std::string& rConnectionDetails);
         ~BackupStoreContext();
 private:
@@ -138 +139 @@
         // Info
         int32_t GetClientID() const {return mClientID;}
+        const std::string& GetConnectionDetails() { return mConnectionDetails; }
 
 private:
@@ -147 +149 @@
         int64_t AllocateObjectID();
 
+        std::string mConnectionDetails;
         int32_t mClientID;
         HousekeepingInterface &mrDaemon;

box/trunk/lib/server/ServerStream.h

@@ -49 +49 @@
         {
         }
+
+        std::string mConnectionDetails;
+
+protected:
+        const std::string& GetConnectionDetails()
+        {
+                return mConnectionDetails;
+        }
+
 public:
 
@@ -123 +132 @@
 protected:
         virtual void NotifyListenerIsReady() { }
+        virtual void LogConnectionDetails(std::string details)
+        {
+                BOX_NOTICE("Handling incoming connection from " << details);
+        }
         
 public:
@@ -238 +251 @@
                                         // Get the incoming connection
                                         // (with zero wait time)
-                                        std::string logMessage;
-                                        std::auto_ptr<StreamType> connection(psocket->Accept(0, &logMessage));
+                                        std::auto_ptr<StreamType> connection(
+                                                psocket->Accept(0,
+                                                        &mConnectionDetails));
 
                                         // Was there one (there should be...)
@@ -265 +279 @@
                                                                 EnterChild();
                                                                 SetProcessTitle("transaction");
+                                                                LogConnectionDetails(mConnectionDetails);
                                                                 
                                                                 // Memory leak test the forked process
@@ -282 +297 @@
                                                         
                                                         // Log it
-                                                        BOX_NOTICE("Message from child process " << pid << ": " << logMessage);
+                                                        BOX_TRACE("Forked child process " << pid << 
+                                                                "to handle connection from " <<
+                                                                mConnectionDetails);
                                                 }
                                                 else

box/trunk/lib/server/Socket.cpp

@@ -124 +124 @@
 void Socket::LogIncomingConnection(const struct sockaddr *addr, socklen_t addrlen)
 {
-        if(addr == NULL) {THROW_EXCEPTION(CommonException, BadArguments)}
-
-        switch(addr->sa_family)
-        {
-        case AF_UNIX:
-                BOX_INFO("Incoming connection from local (UNIX socket)");
-                break;          
-        
-        case AF_INET:
-                {
-                        sockaddr_in *a = (sockaddr_in*)addr;
-                        BOX_INFO("Incoming connection from " <<
-                                inet_ntoa(a->sin_addr) << " port " <<
-                                ntohs(a->sin_port));
-                }
-                break;          
-        
-        default:
-                BOX_WARNING("Incoming connection of unknown type");
-                break;
-        }
+        BOX_INFO("Incoming connection from " <<
+                IncomingConnectionLogMessage(addr, addrlen));
 }
 
@@ -162 +143 @@
         {
         case AF_UNIX:
-                return std::string("Incoming connection from local (UNIX socket)");
+                return std::string("local (UNIX socket)");
                 break;          
         
         case AF_INET:
                 {
-                        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);
+                        std::ostringstream oss;
+                        oss << inet_ntoa(a->sin_addr) << " port " <<
+                                ntohs(a->sin_port);
+                        return oss.str();
                 }
                 break;          
         
         default:
-                return std::string("Incoming connection of unknown type");
+                {
+                        std::ostringstream oss;
+                        oss << "unknown socket type " << addr->sa_family;
+                        return oss.str();
+                }
                 break;
         }