From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 15 Apr 2011 17:34:14 +0000 (-0400)
Subject: libafscp fixes
X-Git-Tag: upstream/1.6.1.pre1^2~243
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=59dceb56aa299bc41e8af88c397eb3fbc4a2a78f;p=packages%2Fo%2Fopenafs.git

libafscp fixes

fix callback package in libafscp to track addresses correctly (use
correct byte order)

Reviewed-on: http://gerrit.openafs.org/4474
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 25a46780fc0e9f64010cc06826e5753567c16647)

Change-Id: I71fed5388074b3ca33c374e57a921ff3f4f2e410
Reviewed-on: http://gerrit.openafs.org/5381
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/libafscp/afscp_callback.c b/src/libafscp/afscp_callback.c
index f803e2291..32db5fb95 100644
--- a/src/libafscp/afscp_callback.c
+++ b/src/libafscp/afscp_callback.c
@@ -307,7 +307,7 @@ SRXAFSCB_CallBack(struct rx_call * rxcall, AFSCBFids * Fids_Array,
 {
     struct rx_connection *rxconn = rx_ConnectionOf(rxcall);
     struct rx_peer *rxpeer = rx_PeerOf(rxconn);
-    struct afscp_server *server = afscp_AnyServerByAddr(rxpeer->host);
+    struct afscp_server *server = afscp_AnyServerByAddr(rx_HostOf(rxpeer));
     struct afscp_callback *cb;
     struct afscp_venusfid f;
     struct AFSFid *fid;
@@ -351,7 +351,7 @@ SRXAFSCB_InitCallBackState(struct rx_call * rxcall)
 {
     struct rx_connection *rxconn = rx_ConnectionOf(rxcall);
     struct rx_peer *rxpeer = rx_PeerOf(rxconn);
-    struct afscp_server *server = afscp_AnyServerByAddr(rxpeer->host);
+    struct afscp_server *server = afscp_AnyServerByAddr(rx_HostOf(rxpeer));
     struct afscp_callback *cb;
     struct afscp_venusfid f;
     int i;
@@ -594,7 +594,7 @@ SRXAFSCB_InitCallBackState3(struct rx_call * rxcall, afsUUID * serverUuid)
 {
     struct rx_connection *rxconn = rx_ConnectionOf(rxcall);
     struct rx_peer *rxpeer = rx_PeerOf(rxconn);
-    struct afscp_server *server = afscp_AnyServerByAddr(rxpeer->host);
+    struct afscp_server *server = afscp_AnyServerByAddr(rx_HostOf(rxpeer));
     struct afscp_callback *cb;
     struct afscp_venusfid f;
     int i;
diff --git a/src/libafscp/afscp_server.c b/src/libafscp/afscp_server.c
index 826ef9800..bb56f8d6d 100644
--- a/src/libafscp/afscp_server.c
+++ b/src/libafscp/afscp_server.c
@@ -332,6 +332,7 @@ afscp_ServerById(struct afscp_cell *thecell, afsUUID * u)
     return ret;
 }
 
+/* takes server in host byte order */
 struct afscp_server *
 afscp_ServerByAddr(struct afscp_cell *thecell, afs_uint32 addr)
 {
@@ -433,6 +434,7 @@ afscp_ServerByAddr(struct afscp_cell *thecell, afs_uint32 addr)
     return ret;
 }
 
+/* takes server in host byte order */
 struct afscp_server *
 afscp_AnyServerByAddr(afs_uint32 addr)
 {