From: Antoine Verheijen <antoine@ualberta.ca>
Date: Wed, 1 Dec 2010 18:54:23 +0000 (-0700)
Subject: Darwin: Assign correct value to myDstaddr in afsi_SetServerIPRank()
X-Git-Tag: openafs-stable-1_6_0pre1~27
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8a534a9a8e0d0f3547130ffb4c9bc74f71839869;p=packages%2Fo%2Fopenafs.git

Darwin: Assign correct value to myDstaddr in afsi_SetServerIPRank()

The value in sin->sin_addr.s_addr that's assigned to myDstaddr in the
Darwin version of afsi_SetServerIPRank() is in network byte order but
really needs to be in host byte order.

Note: This patch assumes that change I66f5c790d8c55b359e3550b6d71f3abe040a2820
      has been previously installed. The patch fails otherwise.
Reviewed-on: http://gerrit.openafs.org/3402
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 2822416059fe192dc7e3c261b1e93510f2f10f3e)
Change-Id: I6fba524733ecf35e60419d449838e93a7a5255a6
Reviewed-on: http://gerrit.openafs.org/3452
---

diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
index 3f64e9cd1..bd423dcc3 100644
--- a/src/afs/afs_server.c
+++ b/src/afs/afs_server.c
@@ -1262,7 +1262,7 @@ afsi_SetServerIPRank(struct srvAddr *sa, rx_ifaddr_t ifa)
     t = rx_ifaddr_dstaddress(ifa, &sout, sizeof(sout));
     if (t != 0) {
 	sin = (struct sockaddr_in *)&sout;
-	myDstaddr = sin->sin_addr.s_addr;
+	myDstaddr = ntohl(sin->sin_addr.s_addr);
     } else {
 	myDstaddr = 0;
     }