From: Volker Lendecke <vl@samba.org>
Date: Sat, 13 Feb 2021 10:16:17 +0000 (+0100)
Subject: lib: Fix samba_sockaddr_[get|set]_port
X-Git-Tag: tevent-0.11.0~1620
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcbfae42795f4dadb35a8f59a0165467708c3e71;p=thirdparty%2Fsamba.git

lib: Fix samba_sockaddr_[get|set]_port

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index 5e62fefa146..fe474dc16be 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -1117,12 +1117,12 @@ bool sockaddr_storage_to_samba_sockaddr(
 bool samba_sockaddr_set_port(struct samba_sockaddr *sa, uint16_t port)
 {
 	if (sa->u.sa.sa_family == AF_INET) {
-		sa->u.in.sin_port = port;
+		sa->u.in.sin_port = htons(port);
 		return true;
 	}
 #ifdef HAVE_IPV6
 	if (sa->u.sa.sa_family == AF_INET6) {
-		sa->u.in6.sin6_port = port;
+		sa->u.in6.sin6_port = htons(port);
 		return true;
 	}
 #endif
@@ -1132,12 +1132,12 @@ bool samba_sockaddr_set_port(struct samba_sockaddr *sa, uint16_t port)
 bool samba_sockaddr_get_port(const struct samba_sockaddr *sa, uint16_t *port)
 {
 	if (sa->u.sa.sa_family == AF_INET) {
-		*port = sa->u.in.sin_port;
+		*port = ntohs(sa->u.in.sin_port);
 		return true;
 	}
 #ifdef HAVE_IPV6
 	if (sa->u.sa.sa_family == AF_INET6) {
-		*port = sa->u.in6.sin6_port;
+		*port = ntohs(sa->u.in6.sin6_port);
 		return true;
 	}
 #endif