common/address_helper: drop entity_addr_from_sockaddr

entity_addr_t::set_sockaddr() does this.

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

diff --git a/src/common/address_helper.cc b/src/common/address_helper.cc
index 4431cb6dd9442ee19af62abd0f0e737842e1c2f3..4637935ebc7b23ea94f8d27394214f2fd75c3c89 100644 (file)
--- a/src/common/address_helper.cc
+++ b/src/common/address_helper.cc
@@ -51,34 +51,3 @@ int entity_addr_from_url(entity_addr_t *addr /* out */, const char *url)
        return 1;
 }
 
-int entity_addr_from_sockaddr(entity_addr_t *addr /* out */,
-                             const struct sockaddr *sa)
-{
-    struct sockaddr_in *sin;
-    struct sockaddr_in6 *sin6;
-
-    if (! sa)
-       return 0;
-
-    addr->addr.ss_family = sa->sa_family;
-    switch(sa->sa_family) {
-    case AF_INET:
-       sin = (struct sockaddr_in *) sa;
-       memcpy(&addr->addr4.sin_addr, &sin->sin_addr,
-              sizeof(sin->sin_addr));
-       addr->addr4.sin_port = sin->sin_port;
-       break;
-    case AF_INET6:
-       sin6 = (struct sockaddr_in6 *) sa;
-       memcpy(&addr->addr6.sin6_addr, &sin6->sin6_addr,
-              sizeof(sin6->sin6_addr));
-       addr->addr6.sin6_port = sin6->sin6_port;
-       break;
-    default:
-       break;
-    };
-
-    return 1;
-}
-
-

diff --git a/src/common/address_helper.h b/src/common/address_helper.h
index cdb60612c7f8721ce709df50d957bf47d17260a5..047bd0a0b639b9de453d70ca1fe678f6bf0422e9 100644 (file)
--- a/src/common/address_helper.h
+++ b/src/common/address_helper.h
@@ -18,7 +18,5 @@
 #include "msg/msg_types.h"
 
 int entity_addr_from_url(entity_addr_t *addr /* out */, const char *url);
-int entity_addr_from_sockaddr(entity_addr_t *addr /* out */,
-                             const struct sockaddr *sa);
 
 #endif /* ADDRESS_HELPER_H_ */