From 2b04946f49d695ce6410d6dccaf2475b7af2ca93 Mon Sep 17 00:00:00 2001 From: Simon Giesecke Date: Fri, 1 Feb 2019 03:59:44 -0500 Subject: [PATCH] Problem: code duplication around getsockname Solution: also use get_socket_address from base class --- src/tipc_listener.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/tipc_listener.cpp b/src/tipc_listener.cpp index e139a244..6cea02d9 100644 --- a/src/tipc_listener.cpp +++ b/src/tipc_listener.cpp @@ -111,13 +111,8 @@ int zmq::tipc_listener_t::set_address (const char *addr_) // If random Port Identity, update address object to reflect the assigned address if (_address.is_random ()) { struct sockaddr_storage ss; -#ifdef ZMQ_HAVE_VXWORKS - int sl = sizeof (ss); -#else - socklen_t sl = sizeof (ss); -#endif - int rc = getsockname (_s, (sockaddr *) &ss, &sl); - if (rc != 0) + const zmq_socklen_t sl = get_socket_address (&ss); + if (sl == 0) goto error; _address = tipc_address_t ((struct sockaddr *) &ss, sl);