From: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Date: Mon, 5 Mar 2012 16:41:08 +0000 (-0500)
Subject: rxgen: fix to use rx accessor routines
X-Git-Tag: upstream/1.8.0_pre1^2~2706
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4cc3923b1b857368a522be55c55fce4c9b62548a;p=packages%2Fo%2Fopenafs.git

rxgen: fix to use rx accessor routines

apparently some uses didnt get converted during the previous work.

Change-Id: Iaa4dcf73fd2e29e3f95feede5217eac4eaded4e2
Reviewed-on: http://gerrit.openafs.org/6874
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c
index 0ebaefa3f..0d87c5f60 100644
--- a/src/rxgen/rpc_parse.c
+++ b/src/rxgen/rpc_parse.c
@@ -1329,8 +1329,8 @@ cs_ProcTail_setup(definition * defp, int split_flag)
 	} else {
 	    f_print(fout,
 		    "\t    rx_RecordCallStatistics(z_call, \n"
-		    "\t\t(((afs_uint32)(ntohs(z_call->conn->serviceId) << 16)) |\n"
-		    "\t\t((afs_uint32)ntohs(z_call->conn->peer->port))),\n");
+		    "\t\t(((afs_uint32)(ntohs(rx_ServiceIdOf(rx_ConnectionOf(z_call))) << 16)) |\n"
+		    "\t\t((afs_uint32)ntohs(rx_PortOf(rx_PeerOf(rx_ConnectionOf(z_call)))))),\n");
 	}
 	f_print(fout, "\t\t%d, %sNO_OF_STAT_FUNCS, 1);\n",
 		no_of_stat_funcs, PackagePrefix[PackageIndex]);
@@ -1708,8 +1708,8 @@ ss_ProcTail_setup(definition * defp, int somefrees)
 	    f_print(fout, " %s,\n", PackageStatIndex[PackageIndex]);
 	} else {
 	    f_print(fout,
-		    "\n\t\t(((afs_uint32)(ntohs(z_call->conn->serviceId) << 16)) |\n"
-		    "\t\t((afs_uint32)ntohs(z_call->conn->service->servicePort))),\n");
+		    "\n\t\t(((afs_uint32)(ntohs(rx_ServiceIdOf(rx_ConnectionOf(z_call))) << 16)) |\n"
+		    "\t\t((afs_uint32)ntohs(rx_ServiceOf(rx_ConnectionOf(z_call))->servicePort))),\n");
 	}
 	f_print(fout, "\t\t%d, %sNO_OF_STAT_FUNCS, 0);\n",
 		no_of_stat_funcs, PackagePrefix[PackageIndex]);
@@ -1728,8 +1728,8 @@ ss_ProcTail_setup(definition * defp, int somefrees)
 		f_print(fout, " %s,\n", PackageStatIndex[PackageIndex]);
 	    } else {
 		f_print(fout,
-			"\n\t\t(((afs_uint32)(ntohs(z_call->conn->serviceId) << 16)) |\n"
-			"\t\t((afs_uint32)ntohs(z_call->conn->service->servicePort))),\n");
+			"\n\t\t(((afs_uint32)(ntohs(rx_ServiceIdOf(rx_ConnectionOf(z_call))) << 16)) |\n"
+			"\t\t((afs_uint32)ntohs(rx_ServiceOf(rx_ConnectionOf(z_call))->servicePort))),\n");
 	    }
 	    f_print(fout, "\t\t%d, %sNO_OF_STAT_FUNCS, 0);\n",
 		    no_of_stat_funcs, PackagePrefix[PackageIndex]);