From: Sage Weil <sage@redhat.com>
Date: Fri, 6 May 2016 14:10:54 +0000 (-0400)
Subject: msg/msg_types: drop addr(), addr_size() accessors
X-Git-Tag: v11.0.0~549^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd46293c3c03893225f0be792ec250d5881031c6;p=ceph.git

msg/msg_types: drop addr(), addr_size() accessors

addr() returns a reference to a sockaddr_storage, which we want to drop.

addr_size() is replaced by get_sockaddr_len().

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

diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index 0e176b9ec0c7..4f9fddbf8acd 100644
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -207,18 +207,6 @@ struct entity_addr_t {
     sockaddr_in6 addr6;
   };
 
-  unsigned int addr_size() const {
-    switch (addr.ss_family) {
-    case AF_INET:
-      return sizeof(addr4);
-      break;
-    case AF_INET6:
-      return sizeof(addr6);
-      break;
-    }
-    return sizeof(addr);
-  }
-
   entity_addr_t() : type(0), nonce(0) { 
     memset(&addr, 0, sizeof(addr));
   }
@@ -241,9 +229,6 @@ struct entity_addr_t {
     addr.ss_family = f;
   }
   
-  sockaddr_storage &ss_addr() {
-    return addr;
-  }
   sockaddr_in &in4_addr() {
     return addr4;
   }