 @@ -1,14 +1,14 @@
-/*	$NetBSD: clnt_vc.c,v 1.23 2013/05/07 21:08:45 christos Exp $	*/
+/*	$NetBSD: clnt_vc.c,v 1.24 2013/10/17 23:58:05 christos Exp $	*/
 /*
  * Copyright (c) 2010, Oracle America, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  *       copyright notice, this list of conditions and the following
  *       disclaimer in the documentation and/or other materials
 @@ -28,27 +28,27 @@
  *   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  *   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char *sccsid = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";
 static char sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #else
-__RCSID("$NetBSD: clnt_vc.c,v 1.23 2013/05/07 21:08:45 christos Exp $");
+__RCSID("$NetBSD: clnt_vc.c,v 1.24 2013/10/17 23:58:05 christos Exp $");
 #endif
 #endif
 /*
  * clnt_tcp.c, Implements a TCP/IP based, client side RPC.
+ *
  * Copyright (C) 1984, Sun Microsystems, Inc.
+ *
  * TCP based RPC supports 'batched calls'.
  * A sequence of calls may be batched-up in a send buffer.  The rpc call
  * return immediately to the client even though the call was not necessarily
  * sent.  The batching occurs if the results' xdr routine is NULL (0) AND
  * the rpc timeout value is zero (see clnt.h, rpc).
 @@ -134,26 +134,53 @@ extern mutex_t  clnt_fd_lock;
 static cond_t   *vc_cv;
 #define release_fd_lock(fd, mask) {             \
 	mutex_lock(&clnt_fd_lock);      \
 	vc_fd_locks[fd] = 0;            \
 	mutex_unlock(&clnt_fd_lock);    \
 	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);        \
 	cond_signal(&vc_cv[fd]);        \
+}
 #else
 #define release_fd_lock(fd,mask)
 #define __rpc_lock_value 0
 #endif
 static __inline void
 htonlp(void *dst, const void *src)
+{
 #if 0
 	uint32_t tmp;
 	memcpy(&tmp, src, sizeof(tmp));
 	tmp = htonl(tmp);
 	memcpy(dst, &tmp, sizeof(tmp));
 #else
 	/* We are aligned, so we think */
 	*(uint32_t *)dst = htonl(*(const uint32_t *)src);
 #endif
+}
 static __inline void
 ntohlp(void *dst, const void *src)
+{
 #if 0
 	uint32_t tmp;
 	memcpy(&tmp, src, sizeof(tmp));
 	tmp = ntohl(tmp);
 	memcpy(dst, &tmp, sizeof(tmp));
 #else
 	/* We are aligned, so we think */
 	*(uint32_t *)dst = htonl(*(const uint32_t *)src);
 #endif
+}
 /*
  * Create a client handle for a connection.
  * Default options are set, which the user can change using clnt_control()'s.
  * The rpc/vc package does buffering similar to stdio, so the client
  * must pick send and receive buffer sizes, 0 => use the default.
  * NB: fd is copied into a private area.
  * NB: The rpch->cl_auth is set null authentication. Caller may wish to
  * set this something more useful.
+ *
  * fd should be an open socket
  */
 CLIENT *
 @@ -568,69 +595,60 @@ clnt_vc_control(
 	case CLGET_SVC_ADDR:
 		/* The caller should not free this memory area */
 		*(struct netbuf *)(void *)info = ct->ct_addr;
 		break;
 	case CLSET_SVC_ADDR:		/* set to new address */
 		release_fd_lock(ct->ct_fd, mask);
 		return (FALSE);
 	case CLGET_XID:
 		/*
 		 * use the knowledge that xid is the
 		 * first element in the call structure
 		 * This will get the xid of the PREVIOUS call
 		 */
-		*(u_int32_t *)(void *)info =
+		ntohlp(info, &ct->ct_u.ct_mcalli);
 		    ntohl(*(u_int32_t *)(void *)&ct->ct_u.ct_mcalli);
 		break;
 	case CLSET_XID:
 		/* This will set the xid of the NEXT call */
-		*(u_int32_t *)(void *)&ct->ct_u.ct_mcalli =
+		htonlp(&ct->ct_u.ct_mcalli, (const char *)info +
-		    htonl(*((u_int32_t *)(void *)info) + 1);
+		    sizeof(uint32_t));
 		/* increment by 1 as clnt_vc_call() decrements once */
 		break;
 	case CLGET_VERS:
 		/*
 		 * This RELIES on the information that, in the call body,
 		 * the version number field is the fifth field from the
 		 * begining of the RPC header. MUST be changed if the
 		 * call_struct is changed
 		 */
-		*(u_int32_t *)(void *)info =
+		ntohlp(info, ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT);
 		    ntohl(*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc +
 * BYTES_PER_XDR_UNIT));
 		break;
 	case CLSET_VERS:
-		*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc +
+		htonlp(ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT, info);
 * BYTES_PER_XDR_UNIT) =
 		    htonl(*(u_int32_t *)(void *)info);
 		break;
 	case CLGET_PROG:
 		/*
 		 * This RELIES on the information that, in the call body,
 		 * the program number field is the fourth field from the
 		 * begining of the RPC header. MUST be changed if the
 		 * call_struct is changed
 		 */
-		*(u_int32_t *)(void *)info =
+		ntohlp(info, ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT);
 		    ntohl(*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc +
 * BYTES_PER_XDR_UNIT));
 		break;
 	case CLSET_PROG:
-		*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc +
+		htonlp(ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT, info);
 * BYTES_PER_XDR_UNIT) =
 		    htonl(*(u_int32_t *)(void *)info);
 		break;
 	default:
 		release_fd_lock(ct->ct_fd, mask);
 		return (FALSE);
+	}
 	release_fd_lock(ct->ct_fd, mask);
 	return (TRUE);
+}
 static void
 clnt_vc_destroy(CLIENT *cl)