msg/Connection: add get_peer_socket_addr()

Return the addr that is actually being used for this socket (among the
potentially many in the addrvec).

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

diff --git a/src/msg/Connection.h b/src/msg/Connection.h
index 606aa046f36f50ac7bf4b81206396c7120655408..d4ed134b2714ff9d63e97c19bebd7f66de3da7f9 100644 (file)
--- a/src/msg/Connection.h
+++ b/src/msg/Connection.h
@@ -157,6 +157,9 @@ public:
   bool peer_is_osd() const { return peer_type == CEPH_ENTITY_TYPE_OSD; }
   bool peer_is_client() const { return peer_type == CEPH_ENTITY_TYPE_CLIENT; }
 
+  /// which of the peer's addrs is actually in use for this connection
+  virtual entity_addr_t get_peer_socket_addr() const = 0;
+
   entity_addr_t get_peer_addr() const {
     return peer_addrs.front();
   }

diff --git a/src/msg/async/AsyncConnection.h b/src/msg/async/AsyncConnection.h
index 53efda01f86cfb116d1311006c279960e124fee0..4ec8e0eb7c10e228d788087a7c72865c182dec46 100644 (file)
--- a/src/msg/async/AsyncConnection.h
+++ b/src/msg/async/AsyncConnection.h
@@ -212,6 +212,9 @@ class AsyncConnection : public Connection {
     std::lock_guard<std::mutex> l(lock);
     policy.lossy = true;
   }
+  entity_addr_t get_peer_socket_addr() const override {
+    return target_addr;
+  }
   
  private:
   enum {

diff --git a/src/msg/simple/PipeConnection.h b/src/msg/simple/PipeConnection.h
index 0413919385468bb8e8ff61ab8ac3c4d84642e5ac..4e5c7c37c7157bad5444383fc1accad65ec7962d 100644 (file)
--- a/src/msg/simple/PipeConnection.h
+++ b/src/msg/simple/PipeConnection.h
@@ -48,6 +48,10 @@ public:
   void mark_down() override;
   void mark_disposable() override;
 
+  entity_addr_t get_peer_socket_addr() const override {
+    return peer_addrs.front();
+  }
+
 }; /* PipeConnection */
 
 typedef boost::intrusive_ptr<PipeConnection> PipeConnectionRef;