Move set_sockaddr_port to libutil.

diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index eb5e2255c99df9a41044aef788d043ebe6746c8f..228393a2bbf8cf760b87c6ff4bb17584504b8e21 100644 (file)
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -408,3 +408,17 @@ bool is_address_any(const struct sockaddr *psa)
        }
        return false;
 }
+
+void set_sockaddr_port(struct sockaddr *psa, uint16_t port)
+{
+#if defined(HAVE_IPV6)
+       if (psa->sa_family == AF_INET6) {
+               ((struct sockaddr_in6 *)psa)->sin6_port = htons(port);
+       }
+#endif
+       if (psa->sa_family == AF_INET) {
+               ((struct sockaddr_in *)psa)->sin_port = htons(port);
+       }
+}
+
+

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 667dbf6dad7799e4fe6c684fe15ec77f4f0cfc8f..5721f412d6225bc1d6976d6a33d6699b6065efd5 100644 (file)
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -241,18 +241,6 @@ static int get_socket_port(int fd)
 }
 #endif
 
-void set_sockaddr_port(struct sockaddr_storage *psa, uint16 port)
-{
-#if defined(HAVE_IPV6)
-       if (psa->ss_family == AF_INET6) {
-               ((struct sockaddr_in6 *)psa)->sin6_port = htons(port);
-       }
-#endif
-       if (psa->ss_family == AF_INET) {
-               ((struct sockaddr_in *)psa)->sin_port = htons(port);
-       }
-}
-
 const char *client_name(int fd)
 {
        return get_peer_name(fd,false);