msg/Pipe: log port number

This helps correlate log output with specific tcp sessions as reported by
e.g. netstat or tcpdump or whatever.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 1c9eeff2defb4b620cb3a49dbd9ae57b6065c318..dae314ca09d86c266f8cd3b3302bf4d45485333f 100644 (file)
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -31,7 +31,7 @@
 #define dout_prefix _pipe_prefix(_dout)
 ostream& Pipe::_pipe_prefix(std::ostream *_dout) {
   return *_dout << "-- " << msgr->get_myinst().addr << " >> " << peer_addr << " pipe(" << this
-               << " sd=" << sd
+               << " sd=" << sd << " :" << port
                << " pgs=" << peer_global_seq
                << " cs=" << connect_seq
                << " l=" << policy.lossy
@@ -47,7 +47,7 @@ ostream& Pipe::_pipe_prefix(std::ostream *_dout) {
 Pipe::Pipe(SimpleMessenger *r, int st, Connection *con)
   : reader_thread(this), writer_thread(this),
     msgr(r),
-    sd(-1),
+    sd(-1), port(0),
     peer_type(-1),
     pipe_lock("SimpleMessenger::Pipe::pipe_lock"),
     state(st),
@@ -156,6 +156,8 @@ int Pipe::accept()
   bufferlist addrs;
   ::encode(msgr->my_inst.addr, addrs);
 
+  port = msgr->my_inst.addr.get_port();
+
   // and peer's socket addr (they might not know their ip)
   entity_addr_t socket_addr;
   socklen_t len = sizeof(socket_addr.ss_addr());
@@ -662,6 +664,7 @@ int Pipe::connect()
     bufferlist::iterator p = addrbl.begin();
     ::decode(paddr, p);
     ::decode(peer_addr_for_me, p);
+    port = peer_addr_for_me.get_port();
   }
 
   ldout(msgr->cct,20) << "connect read peer addr " << paddr << " on socket " << sd << dendl;

diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h
index df72c4240a53a76ab78750c46b8d1d6250338251..82b8139648d77b788fff91c372ac55e71803f6c7 100644 (file)
--- a/src/msg/Pipe.h
+++ b/src/msg/Pipe.h
@@ -92,6 +92,7 @@ class DispatchQueue;
     }
 
     int sd;
+    int port;
     int peer_type;
     entity_addr_t peer_addr;
     Messenger::Policy policy;