crimson/net: cleanup, rename _peer_addr to _my_addr_from_peer

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc
index f919b2d60486ee04c54156e448dd1d31e65184e3..47216d096121804532848c119768b543eb357be8 100644 (file)
--- a/src/crimson/net/ProtocolV2.cc
+++ b/src/crimson/net/ProtocolV2.cc
@@ -791,7 +791,7 @@ void ProtocolV2::execute_connecting()
         }).then([this] {
           return banner_exchange();
         }).then([this] (entity_type_t _peer_type,
-                        entity_addr_t _peer_addr) {
+                        entity_addr_t _my_addr_from_peer) {
           if (conn.get_peer_type() != _peer_type) {
             logger().debug("{} connection peer type does not match what peer advertises {} != {}",
                            conn, ceph_entity_type_name(conn.get_peer_type()),
@@ -801,8 +801,8 @@ void ProtocolV2::execute_connecting()
           }
           if (messenger.get_myaddrs().empty() ||
               messenger.get_myaddrs().front().is_blank_ip()) {
-            logger().trace("peer {} says I am {}", conn.target_addr, _peer_addr);
-            return messenger.learned_addr(_peer_addr);
+            logger().trace("peer {} says I am {}", conn.target_addr, _my_addr_from_peer);
+            return messenger.learned_addr(_my_addr_from_peer);
           } else {
             return seastar::now();
           }
@@ -1203,7 +1203,7 @@ void ProtocolV2::execute_accepting()
       enable_recording();
       return banner_exchange()
         .then([this] (entity_type_t _peer_type,
-                      entity_addr_t _peer_addr) {
+                      entity_addr_t _my_addr_from_peer) {
           ceph_assert(conn.get_peer_type() == 0);
           conn.set_peer_type(_peer_type);