From 863672c546ef3b35bfefed9643a88ef731451239 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 11 May 2016 12:39:42 -0400 Subject: [PATCH] common/address_helper: use set_sockaddr Signed-off-by: Sage Weil --- src/common/address_helper.cc | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/common/address_helper.cc b/src/common/address_helper.cc index 35cb0f2b5d46c..4431cb6dd9442 100644 --- a/src/common/address_helper.cc +++ b/src/common/address_helper.cc @@ -41,23 +41,7 @@ int entity_addr_from_url(entity_addr_t *addr /* out */, const char *url) hints.ai_family = PF_UNSPEC; error = getaddrinfo(host.c_str(), NULL, &hints, &res); if (! error) { - struct sockaddr_in *sin; - struct sockaddr_in6 *sin6; - addr->addr.ss_family = res->ai_family; - switch(res->ai_family) { - case AF_INET: - sin = (struct sockaddr_in *) res->ai_addr; - memcpy(&addr->addr4.sin_addr, &sin->sin_addr, - sizeof(sin->sin_addr)); - break; - case AF_INET6: - sin6 = (struct sockaddr_in6 *) res->ai_addr; - memcpy(&addr->addr6.sin6_addr, &sin6->sin6_addr, - sizeof(sin6->sin6_addr)); - break; - default: - break; - }; + addr->set_sockaddr((sockaddr*)res->ai_addr); addr->set_port(std::atoi(port.c_str())); freeaddrinfo(res); return 0; -- 2.39.5