From 830940567b49bb0c08dfaed40418999e76616909 Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 17 Aug 2009 08:03:02 +0000
Subject: Remove files that are no longer used.
Discussed with: kmacy
Approved by: re (kib)
---
cddl/lib/libnvpair/Makefile | 1 +
sys/cddl/compat/opensolaris/rpc/xdr.h | 112 ----
.../opensolaris/uts/common/rpc/opensolaris_xdr.c | 621 --------------------
.../uts/common/rpc/opensolaris_xdr_array.c | 114 ----
.../uts/common/rpc/opensolaris_xdr_mem.c | 209 -------
sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h | 632 ---------------------
6 files changed, 1 insertion(+), 1688 deletions(-)
delete mode 100644 sys/cddl/compat/opensolaris/rpc/xdr.h
delete mode 100644 sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c
delete mode 100644 sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c
delete mode 100644 sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c
delete mode 100644 sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 120339002ce4..7bf500193dc7 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -13,5 +13,6 @@ SRCS= libnvpair.c \
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys
.include <bsd.lib.mk>
diff --git a/sys/cddl/compat/opensolaris/rpc/xdr.h b/sys/cddl/compat/opensolaris/rpc/xdr.h
deleted file mode 100644
index 5802f3f12baa..000000000000
--- a/sys/cddl/compat/opensolaris/rpc/xdr.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * $FreeBSD$
- */
-/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-/*
- * Portions of this source code were derived from Berkeley 4.3 BSD
- * under license from the Regents of the University of California.
- */
-
-#ifndef _OPENSOLARIS_RPC_XDR_H_
-#define _OPENSOLARIS_RPC_XDR_H_
-
-#include_next <rpc/xdr.h>
-
-#ifndef _KERNEL
-#include_next <rpc/xdr.h>
-
-/*
- * Strangely, my glibc version (2.3.6) doesn't have xdr_control(), so
- * we have to hack it in here (source taken from OpenSolaris).
- * By the way, it is assumed the xdrmem implementation is used.
- */
-
-#undef xdr_control
-#define xdr_control(a,b,c) xdrmem_control(a,b,c)
-
-/*
- * These are the request arguments to XDR_CONTROL.
- *
- * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream.
- * XDR_SKIPBYTES - skips the next N bytes in the XDR stream.
- * XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from
- * the XDR stream being moved over RDMA
- * XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in
- * the XDR stream moving over RDMA.
- */
-#define XDR_PEEK 2
-#define XDR_SKIPBYTES 3
-#define XDR_RDMAGET 4
-#define XDR_RDMASET 5
-
-/* FIXME: probably doesn't work */
-static __inline bool_t
-xdrmem_control(XDR *xdrs, int request, void *info)
-{
- xdr_bytesrec *xptr;
- int32_t *int32p;
- int len;
-
- switch (request) {
-
- case XDR_GET_BYTES_AVAIL:
- xptr = (xdr_bytesrec *)info;
- xptr->xc_is_last_record = TRUE;
- xptr->xc_num_avail = xdrs->x_handy;
- return (TRUE);
-
- case XDR_PEEK:
- /*
- * Return the next 4 byte unit in the XDR stream.
- */
- if (xdrs->x_handy < sizeof (int32_t))
- return (FALSE);
- int32p = (int32_t *)info;
- *int32p = (int32_t)ntohl((uint32_t)
- (*((int32_t *)(xdrs->x_private))));
- return (TRUE);
-
- case XDR_SKIPBYTES:
- /*
- * Skip the next N bytes in the XDR stream.
- */
- int32p = (int32_t *)info;
- len = RNDUP((int)(*int32p));
- if ((xdrs->x_handy -= len) < 0)
- return (FALSE);
- xdrs->x_private += len;
- return (TRUE);
-
- }
- return (FALSE);
-}
-#endif /* !_KERNEL */
-
-#endif /* !_OPENSOLARIS_RPC_XDR_H_ */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c b/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c
deleted file mode 100644
index b38833afb545..000000000000
--- a/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-/*
- * Portions of this source code were derived from Berkeley 4.3 BSD
- * under license from the Regents of the University of California.
- */
-
-/*
- * xdr.c, generic XDR routines implementation.
- * These are the "generic" xdr routines used to serialize and de-serialize
- * most common data items. See xdr.h for more info on the interface to
- * xdr.
- */
-
-#include <sys/param.h>
-#include <sys/cmn_err.h>
-#include <sys/types.h>
-#include <sys/systm.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#pragma weak xdr_int32_t = xdr_int
-#pragma weak xdr_uint32_t = xdr_u_int
-#pragma weak xdr_int64_t = xdr_longlong_t
-#pragma weak xdr_uint64_t = xdr_u_longlong_t
-
-#if defined(sun)
-#if !defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
-#error "Exactly one of _BIG_ENDIAN or _LITTLE_ENDIAN must be defined"
-#elif defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN)
-#error "Only one of _BIG_ENDIAN or _LITTLE_ENDIAN may be defined"
-#endif
-#endif
-
-/*
- * constants specific to the xdr "protocol"
- */
-#define XDR_FALSE ((int32_t)0)
-#define XDR_TRUE ((int32_t)1)
-#define LASTUNSIGNED ((uint_t)0-1)
-
-/*
- * for unit alignment
- */
-static char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
-
-/*
- * Free a data structure using XDR
- * Not a filter, but a convenient utility nonetheless
- */
-void
-xdr_free(xdrproc_t proc, char *objp)
-{
- XDR x;
-
- x.x_op = XDR_FREE;
- (*proc)(&x, objp);
-}
-
-/*
- * XDR nothing
- */
-bool_t
-xdr_void(void)
-{
- return (TRUE);
-}
-
-/*
- * XDR integers
- *
- * PSARC 2003/523 Contract Private Interface
- * xdr_int
- * Changes must be reviewed by Solaris File Sharing
- * Changes must be communicated to contract-2003-523@sun.com
- */
-bool_t
-xdr_int(XDR *xdrs, int *ip)
-{
- if (xdrs->x_op == XDR_ENCODE)
- return (XDR_PUTINT32(xdrs, ip));
-
- if (xdrs->x_op == XDR_DECODE)
- return (XDR_GETINT32(xdrs, ip));
-
- if (xdrs->x_op == XDR_FREE)
- return (TRUE);
-
- return (FALSE);
-}
-
-/*
- * XDR unsigned integers
- *
- * PSARC 2003/523 Contract Private Interface
- * xdr_u_int
- * Changes must be reviewed by Solaris File Sharing
- * Changes must be communicated to contract-2003-523@sun.com
- */
-bool_t
-xdr_u_int(XDR *xdrs, uint_t *up)
-{
- if (xdrs->x_op == XDR_ENCODE)
- return (XDR_PUTINT32(xdrs, (int32_t *)up));
-
- if (xdrs->x_op == XDR_DECODE)
- return (XDR_GETINT32(xdrs, (int32_t *)up));
-
- if (xdrs->x_op == XDR_FREE)
- return (TRUE);
-
- return (FALSE);
-}
-
-
-#if defined(_ILP32)
-/*
- * xdr_long and xdr_u_long for binary compatability on ILP32 kernels.
- *
- * No prototypes since new code should not be using these interfaces.
- */
-bool_t
-xdr_long(XDR *xdrs, long *ip)
-{
- return (xdr_int(xdrs, (int *)ip));
-}
-
-bool_t
-xdr_u_long(XDR *xdrs, unsigned long *up)
-{
- return (xdr_u_int(xdrs, (uint_t *)up));
-}
-#endif /* _ILP32 */
-
-
-/*
- * XDR long long integers
- */
-bool_t
-xdr_longlong_t(XDR *xdrs, longlong_t *hp)
-{
- if (xdrs->x_op == XDR_ENCODE) {
-#if BYTE_ORDER == _LITTLE_ENDIAN
- if (XDR_PUTINT32(xdrs, (int32_t *)((char *)hp +
- BYTES_PER_XDR_UNIT)) == TRUE) {
- return (XDR_PUTINT32(xdrs, (int32_t *)hp));
- }
-#else
- if (XDR_PUTINT32(xdrs, (int32_t *)hp) == TRUE) {
- return (XDR_PUTINT32(xdrs, (int32_t *)((char *)hp +
- BYTES_PER_XDR_UNIT)));
- }
-#endif
- return (FALSE);
-
- }
- if (xdrs->x_op == XDR_DECODE) {
-#if BYTE_ORDER == _LITTLE_ENDIAN
- if (XDR_GETINT32(xdrs, (int32_t *)((char *)hp +
- BYTES_PER_XDR_UNIT)) == TRUE) {
- return (XDR_GETINT32(xdrs, (int32_t *)hp));
- }
-#else
- if (XDR_GETINT32(xdrs, (int32_t *)hp) == TRUE) {
- return (XDR_GETINT32(xdrs, (int32_t *)((char *)hp +
- BYTES_PER_XDR_UNIT)));
- }
-#endif
- return (FALSE);
- }
- return (TRUE);
-}
-
-/*
- * XDR unsigned long long integers
- */
-bool_t
-xdr_u_longlong_t(XDR *xdrs, u_longlong_t *hp)
-{
-
- if (xdrs->x_op == XDR_ENCODE) {
-#if BYTE_ORDER == _LITTLE_ENDIAN
- if (XDR_PUTINT32(xdrs, (int32_t *)((char *)hp +
- BYTES_PER_XDR_UNIT)) == TRUE) {
- return (XDR_PUTINT32(xdrs, (int32_t *)hp));
- }
-#else
- if (XDR_PUTINT32(xdrs, (int32_t *)hp) == TRUE) {
- return (XDR_PUTINT32(xdrs, (int32_t *)((char *)hp +
- BYTES_PER_XDR_UNIT)));
- }
-#endif
- return (FALSE);
-
- }
- if (xdrs->x_op == XDR_DECODE) {
-#if BYTE_ORDER == _LITTLE_ENDIAN
- if (XDR_GETINT32(xdrs, (int32_t *)((char *)hp +
- BYTES_PER_XDR_UNIT)) == TRUE) {
- return (XDR_GETINT32(xdrs, (int32_t *)hp));
- }
-#else
- if (XDR_GETINT32(xdrs, (int32_t *)hp) == TRUE) {
- return (XDR_GETINT32(xdrs, (int32_t *)((char *)hp +
- BYTES_PER_XDR_UNIT)));
- }
-#endif
- return (FALSE);
- }
- return (TRUE);
-}
-
-/*
- * XDR short integers
- */
-bool_t
-xdr_short(XDR *xdrs, short *sp)
-{
- int32_t l;
-
- switch (xdrs->x_op) {
-
- case XDR_ENCODE:
- l = (int32_t)*sp;
- return (XDR_PUTINT32(xdrs, &l));
-
- case XDR_DECODE:
- if (!XDR_GETINT32(xdrs, &l))
- return (FALSE);
- *sp = (short)l;
- return (TRUE);
-
- case XDR_FREE:
- return (TRUE);
- }
- return (FALSE);
-}
-
-/*
- * XDR unsigned short integers
- */
-bool_t
-xdr_u_short(XDR *xdrs, ushort_t *usp)
-{
- uint32_t l;
-
- switch (xdrs->x_op) {
-
- case XDR_ENCODE:
- l = (uint32_t)*usp;
- return (XDR_PUTINT32(xdrs, (int32_t *)&l));
-
- case XDR_DECODE:
- if (!XDR_GETINT32(xdrs, (int32_t *)&l)) {
- return (FALSE);
- }
- *usp = (ushort_t)l;
- return (TRUE);
-
- case XDR_FREE:
- return (TRUE);
- }
- return (FALSE);
-}
-
-
-/*
- * XDR a char
- */
-bool_t
-xdr_char(XDR *xdrs, char *cp)
-{
- int i;
-
- i = (*cp);
- if (!xdr_int(xdrs, &i)) {
- return (FALSE);
- }
- *cp = (char)i;
- return (TRUE);
-}
-
-/*
- * XDR booleans
- *
- * PSARC 2003/523 Contract Private Interface
- * xdr_bool
- * Changes must be reviewed by Solaris File Sharing
- * Changes must be communicated to contract-2003-523@sun.com
- */
-bool_t
-xdr_bool(XDR *xdrs, bool_t *bp)
-{
- int32_t i32b;
-
- switch (xdrs->x_op) {
-
- case XDR_ENCODE:
- i32b = *bp ? XDR_TRUE : XDR_FALSE;
- return (XDR_PUTINT32(xdrs, &i32b));
-
- case XDR_DECODE:
- if (!XDR_GETINT32(xdrs, &i32b)) {
- return (FALSE);
- }
- *bp = (i32b == XDR_FALSE) ? FALSE : TRUE;
- return (TRUE);
-
- case XDR_FREE:
- return (TRUE);
- }
- return (FALSE);
-}
-
-/*
- * XDR enumerations
- *
- * PSARC 2003/523 Contract Private Interface
- * xdr_enum
- * Changes must be reviewed by Solaris File Sharing
- * Changes must be communicated to contract-2003-523@sun.com
- */
-#ifndef lint
-enum sizecheck { SIZEVAL } sizecheckvar; /* used to find the size of */
- /* an enum */
-#endif
-bool_t
-xdr_enum(XDR *xdrs, enum_t *ep)
-{
-#ifndef lint
- /*
- * enums are treated as ints
- */
- if (sizeof (sizecheckvar) == sizeof (int32_t)) {
- return (xdr_int(xdrs, (int32_t *)ep));
- } else if (sizeof (sizecheckvar) == sizeof (short)) {
- return (xdr_short(xdrs, (short *)ep));
- } else {
- return (FALSE);
- }
-#else
- (void) (xdr_short(xdrs, (short *)ep));
- return (xdr_int(xdrs, (int32_t *)ep));
-#endif
-}
-
-/*
- * XDR opaque data
- * Allows the specification of a fixed size sequence of opaque bytes.
- * cp points to the opaque object and cnt gives the byte length.
- *
- * PSARC 2003/523 Contract Private Interface
- * xdr_opaque
- * Changes must be reviewed by Solaris File Sharing
- * Changes must be communicated to contract-2003-523@sun.com
- */
-bool_t
-xdr_opaque(XDR *xdrs, caddr_t cp, const uint_t cnt)
-{
- uint_t rndup;
- static char crud[BYTES_PER_XDR_UNIT];
-
- /*
- * if no data we are done
- */
- if (cnt == 0)
- return (TRUE);
-
- /*
- * round byte count to full xdr units
- */
- rndup = cnt % BYTES_PER_XDR_UNIT;
- if (rndup != 0)
- rndup = BYTES_PER_XDR_UNIT - rndup;
-
- if (xdrs->x_op == XDR_DECODE) {
- if (!XDR_GETBYTES(xdrs, cp, cnt)) {
- return (FALSE);
- }
- if (rndup == 0)
- return (TRUE);
- return (XDR_GETBYTES(xdrs, (caddr_t)crud, rndup));
- }
-
- if (xdrs->x_op == XDR_ENCODE) {
- if (!XDR_PUTBYTES(xdrs, cp, cnt)) {
- return (FALSE);
- }
- if (rndup == 0)
- return (TRUE);
- return (XDR_PUTBYTES(xdrs, xdr_zero, rndup));
- }
-
- if (xdrs->x_op == XDR_FREE)
- return (TRUE);
-
- return (FALSE);
-}
-
-/*
- * XDR counted bytes
- * *cpp is a pointer to the bytes, *sizep is the count.
- * If *cpp is NULL maxsize bytes are allocated
- *
- * PSARC 2003/523 Contract Private Interface
- * xdr_bytes
- * Changes must be reviewed by Solaris File Sharing
- * Changes must be communicated to contract-2003-523@sun.com
- */
-bool_t
-xdr_bytes(XDR *xdrs, char **cpp, uint_t *sizep, const uint_t maxsize)
-{
- char *sp = *cpp; /* sp is the actual string pointer */
- uint_t nodesize;
-
- /*
- * first deal with the length since xdr bytes are counted
- */
- if (!xdr_u_int(xdrs, sizep)) {
- return (FALSE);
- }
- nodesize = *sizep;
- if ((nodesize > maxsize) && (xdrs->x_op != XDR_FREE)) {
- return (FALSE);
- }
-
- /*
- * now deal with the actual bytes
- */
- switch (xdrs->x_op) {
- case XDR_DECODE:
- if (nodesize == 0)
- return (TRUE);
- if (sp == NULL)
- *cpp = sp = (char *)mem_alloc(nodesize);
- /* FALLTHROUGH */
-
- case XDR_ENCODE:
- return (xdr_opaque(xdrs, sp, nodesize));
-
- case XDR_FREE:
- if (sp != NULL) {
- mem_free(sp, nodesize);
- *cpp = NULL;
- }
- return (TRUE);
- }
- return (FALSE);
-}
-
-/*
- * Implemented here due to commonality of the object.
- */
-bool_t
-xdr_netobj(XDR *xdrs, struct netobj *np)
-{
- return (xdr_bytes(xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
-}
-
-/*
- * XDR a descriminated union
- * Support routine for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * an entry with a null procedure pointer. The routine gets
- * the discriminant value and then searches the array of xdrdiscrims
- * looking for that value. It calls the procedure given in the xdrdiscrim
- * to handle the discriminant. If there is no specific routine a default
- * routine may be called.
- * If there is no specific or default routine an error is returned.
- */
-bool_t
-xdr_union(XDR *xdrs, enum_t *dscmp, char *unp,
- const struct xdr_discrim *choices, const xdrproc_t dfault)
-{
- enum_t dscm;
-
- /*
- * we deal with the discriminator; it's an enum
- */
- if (!xdr_enum(xdrs, dscmp)) {
- return (FALSE);
- }
- dscm = *dscmp;
-
- /*
- * search choices for a value that matches the discriminator.
- * if we find one, execute the xdr routine for that value.
- */
- for (; choices->proc != NULL_xdrproc_t; choices++) {
- if (choices->value == dscm)
- return ((*(choices->proc))(xdrs, unp, LASTUNSIGNED));
- }
-
- /*
- * no match - execute the default xdr routine if there is one
- */
- return ((dfault == NULL_xdrproc_t) ? FALSE :
- (*dfault)(xdrs, unp, LASTUNSIGNED));
-}
-
-
-/*
- * Non-portable xdr primitives.
- * Care should be taken when moving these routines to new architectures.
- */
-
-
-/*
- * XDR null terminated ASCII strings
- * xdr_string deals with "C strings" - arrays of bytes that are
- * terminated by a NULL character. The parameter cpp references a
- * pointer to storage; If the pointer is null, then the necessary
- * storage is allocated. The last parameter is the max allowed length
- * of the string as specified by a protocol.
- */
-bool_t
-xdr_string(XDR *xdrs, char **cpp, const uint_t maxsize)
-{
- char *sp = *cpp; /* sp is the actual string pointer */
- uint_t size;
- uint_t nodesize;
-
- /*
- * first deal with the length since xdr strings are counted-strings
- */
- switch (xdrs->x_op) {
- case XDR_FREE:
- if (sp == NULL)
- return (TRUE); /* already free */
- /* FALLTHROUGH */
- case XDR_ENCODE:
- size = (sp != NULL) ? (uint_t)strlen(sp) : 0;
- break;
- case XDR_DECODE:
- break;
- }
- if (!xdr_u_int(xdrs, &size)) {
- return (FALSE);
- }
- if (size > maxsize) {
- return (FALSE);
- }
- nodesize = size + 1;
-
- /*
- * now deal with the actual bytes
- */
- switch (xdrs->x_op) {
- case XDR_DECODE:
- if (nodesize == 0)
- return (TRUE);
- if (sp == NULL)
- sp = (char *)mem_alloc(nodesize);
- sp[size] = 0;
- if (!xdr_opaque(xdrs, sp, size)) {
- /*
- * free up memory if allocated here
- */
- if (*cpp == NULL) {
- mem_free(sp, nodesize);
- }
- return (FALSE);
- }
- if (strlen(sp) != size) {
- if (*cpp == NULL) {
- mem_free(sp, nodesize);
- }
- return (FALSE);
- }
- *cpp = sp;
- return (TRUE);
-
- case XDR_ENCODE:
- return (xdr_opaque(xdrs, sp, size));
-
- case XDR_FREE:
- mem_free(sp, nodesize);
- *cpp = NULL;
- return (TRUE);
- }
- return (FALSE);
-}
-
-/*
- * Wrapper for xdr_string that can be called directly from
- * routines like clnt_call
- */
-bool_t
-xdr_wrapstring(XDR *xdrs, char **cpp)
-{
- if (xdr_string(xdrs, cpp, LASTUNSIGNED))
- return (TRUE);
- return (FALSE);
-}
diff --git a/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c b/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c
deleted file mode 100644
index d37dda6921ac..000000000000
--- a/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-/*
- * Portions of this source code were derived from Berkeley 4.3 BSD
- * under license from the Regents of the University of California.
- */
-
-/*
- * xdr_array.c, Generic XDR routines impelmentation.
- * These are the "non-trivial" xdr primitives used to serialize and de-serialize
- * arrays. See xdr.h for more info on the interface to xdr.
- */
-
-#include <sys/param.h>
-#include <sys/cmn_err.h>
-#include <sys/types.h>
-#include <sys/systm.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#define LASTUNSIGNED ((uint_t)0-1)
-
-/*
- * XDR an array of arbitrary elements
- * *addrp is a pointer to the array, *sizep is the number of elements.
- * If addrp is NULL (*sizep * elsize) bytes are allocated.
- * elsize is the size (in bytes) of each element, and elproc is the
- * xdr procedure to call to handle each element of the array.
- */
-bool_t
-xdr_array(XDR *xdrs, caddr_t *addrp, uint_t *sizep, const uint_t maxsize,
- const uint_t elsize, const xdrproc_t elproc)
-{
- uint_t i;
- caddr_t target = *addrp;
- uint_t c; /* the actual element count */
- bool_t stat = TRUE;
- uint_t nodesize;
-
- /* like strings, arrays are really counted arrays */
- if (!xdr_u_int(xdrs, sizep)) {
- return (FALSE);
- }
- c = *sizep;
- if ((c > maxsize || LASTUNSIGNED / elsize < c) &&
- xdrs->x_op != XDR_FREE) {
- return (FALSE);
- }
- nodesize = c * elsize;
-
- /*
- * if we are deserializing, we may need to allocate an array.
- * We also save time by checking for a null array if we are freeing.
- */
- if (target == NULL)
- switch (xdrs->x_op) {
- case XDR_DECODE:
- if (c == 0)
- return (TRUE);
- *addrp = target = (char *)mem_alloc(nodesize);
- bzero(target, nodesize);
- break;
-
- case XDR_FREE:
- return (TRUE);
-
- case XDR_ENCODE:
- break;
- }
-
- /*
- * now we xdr each element of array
- */
- for (i = 0; (i < c) && stat; i++) {
- stat = (*elproc)(xdrs, target, LASTUNSIGNED);
- target += elsize;
- }
-
- /*
- * the array may need freeing
- */
- if (xdrs->x_op == XDR_FREE) {
- mem_free(*addrp, nodesize);
- *addrp = NULL;
- }
- return (stat);
-}
diff --git a/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c b/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c
deleted file mode 100644
index 32ff32daaa07..000000000000
--- a/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-/*
- * Portions of this source code were derived from Berkeley 4.3 BSD
- * under license from the Regents of the University of California.
- */
-
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-/*
- * xdr_mem.c, XDR implementation using memory buffers.
- *
- * If you have some data to be interpreted as external data representation
- * or to be converted to external data representation in a memory buffer,
- * then this is the package for you.
- */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/systm.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-static struct xdr_ops *xdrmem_ops(void);
-
-/*
- * The procedure xdrmem_create initializes a stream descriptor for a
- * memory buffer.
- */
-void
-xdrmem_create(XDR *xdrs, caddr_t addr, uint_t size, enum xdr_op op)
-{
- xdrs->x_op = op;
- xdrs->x_ops = xdrmem_ops();
- xdrs->x_private = xdrs->x_base = addr;
- xdrs->x_handy = size;
- xdrs->x_public = NULL;
-}
-
-/* ARGSUSED */
-static void
-xdrmem_destroy(XDR *xdrs)
-{
-}
-
-static bool_t
-xdrmem_getint32(XDR *xdrs, int32_t *int32p)
-{
- if ((xdrs->x_handy -= (int)sizeof (int32_t)) < 0)
- return (FALSE);
- /* LINTED pointer alignment */
- *int32p = (int32_t)ntohl((uint32_t)(*((int32_t *)(xdrs->x_private))));
- xdrs->x_private += sizeof (int32_t);
- return (TRUE);
-}
-
-static bool_t
-xdrmem_putint32(XDR *xdrs, int32_t *int32p)
-{
- if ((xdrs->x_handy -= (int)sizeof (int32_t)) < 0)
- return (FALSE);
- /* LINTED pointer alignment */
- *(int32_t *)xdrs->x_private = (int32_t)htonl((uint32_t)(*int32p));
- xdrs->x_private += sizeof (int32_t);
- return (TRUE);
-}
-
-static bool_t
-xdrmem_getbytes(XDR *xdrs, caddr_t addr, int len)
-{
- if ((xdrs->x_handy -= len) < 0)
- return (FALSE);
- bcopy(xdrs->x_private, addr, len);
- xdrs->x_private += len;
- return (TRUE);
-}
-
-static bool_t
-xdrmem_putbytes(XDR *xdrs, caddr_t addr, int len)
-{
- if ((xdrs->x_handy -= len) < 0)
- return (FALSE);
- bcopy(addr, xdrs->x_private, len);
- xdrs->x_private += len;
- return (TRUE);
-}
-
-static uint_t
-xdrmem_getpos(XDR *xdrs)
-{
- return ((uint_t)((uintptr_t)xdrs->x_private - (uintptr_t)xdrs->x_base));
-}
-
-static bool_t
-xdrmem_setpos(XDR *xdrs, uint_t pos)
-{
- caddr_t newaddr = xdrs->x_base + pos;
- caddr_t lastaddr = xdrs->x_private + xdrs->x_handy;
- ptrdiff_t diff;
-
- if (newaddr > lastaddr)
- return (FALSE);
- xdrs->x_private = newaddr;
- diff = lastaddr - newaddr;
- xdrs->x_handy = (int)diff;
- return (TRUE);
-}
-
-static rpc_inline_t *
-xdrmem_inline(XDR *xdrs, int len)
-{
- rpc_inline_t *buf = NULL;
-
- if (xdrs->x_handy >= len) {
- xdrs->x_handy -= len;
- /* LINTED pointer alignment */
- buf = (rpc_inline_t *)xdrs->x_private;
- xdrs->x_private += len;
- }
- return (buf);
-}
-
-static bool_t
-xdrmem_control(XDR *xdrs, int request, void *info)
-{
- xdr_bytesrec *xptr;
- int32_t *int32p;
- int len;
-
- switch (request) {
-
- case XDR_GET_BYTES_AVAIL:
- xptr = (xdr_bytesrec *)info;
- xptr->xc_is_last_record = TRUE;
- xptr->xc_num_avail = xdrs->x_handy;
- return (TRUE);
-
- case XDR_PEEK:
- /*
- * Return the next 4 byte unit in the XDR stream.
- */
- if (xdrs->x_handy < sizeof (int32_t))
- return (FALSE);
- int32p = (int32_t *)info;
- *int32p = (int32_t)ntohl((uint32_t)
- (*((int32_t *)(xdrs->x_private))));
- return (TRUE);
-
- case XDR_SKIPBYTES:
- /*
- * Skip the next N bytes in the XDR stream.
- */
- int32p = (int32_t *)info;
- len = RNDUP((int)(*int32p));
- if ((xdrs->x_handy -= len) < 0)
- return (FALSE);
- xdrs->x_private += len;
- return (TRUE);
-
- }
- return (FALSE);
-}
-
-static struct xdr_ops *
-xdrmem_ops(void)
-{
- static struct xdr_ops ops;
-
- if (ops.x_getint32 == NULL) {
- ops.x_getbytes = xdrmem_getbytes;
- ops.x_putbytes = xdrmem_putbytes;
- ops.x_getpostn = xdrmem_getpos;
- ops.x_setpostn = xdrmem_setpos;
- ops.x_inline = xdrmem_inline;
- ops.x_destroy = xdrmem_destroy;
- ops.x_control = xdrmem_control;
- ops.x_getint32 = xdrmem_getint32;
- ops.x_putint32 = xdrmem_putint32;
- }
- return (&ops);
-}
diff --git a/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h b/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
deleted file mode 100644
index 6cb0c6db3923..000000000000
--- a/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
+++ /dev/null
@@ -1,632 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-/*
- * Portions of this source code were derived from Berkeley
- * 4.3 BSD under license from the Regents of the University of
- * California.
- */
-
-/*
- * xdr.h, External Data Representation Serialization Routines.
- *
- */
-
-#ifndef _RPC_XDR_H
-#define _RPC_XDR_H
-
-#include <sys/byteorder.h> /* For all ntoh* and hton*() kind of macros */
-#include <rpc/types.h> /* For all ntoh* and hton*() kind of macros */
-#ifndef _KERNEL
-#include <stdio.h> /* defines FILE *, used in ANSI C function prototypes */
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * XDR provides a conventional way for converting between C data
- * types and an external bit-string representation. Library supplied
- * routines provide for the conversion on built-in C data types. These
- * routines and utility routines defined here are used to help implement
- * a type encode/decode routine for each user-defined type.
- *
- * Each data type provides a single procedure which takes two arguments:
- *
- * bool_t
- * xdrproc(xdrs, argresp)
- * XDR *xdrs;
- * <type> *argresp;
- *
- * xdrs is an instance of a XDR handle, to which or from which the data
- * type is to be converted. argresp is a pointer to the structure to be
- * converted. The XDR handle contains an operation field which indicates
- * which of the operations (ENCODE, DECODE * or FREE) is to be performed.
- *
- * XDR_DECODE may allocate space if the pointer argresp is null. This
- * data can be freed with the XDR_FREE operation.
- *
- * We write only one procedure per data type to make it easy
- * to keep the encode and decode procedures for a data type consistent.
- * In many cases the same code performs all operations on a user defined type,
- * because all the hard work is done in the component type routines.
- * decode as a series of calls on the nested data types.
- */
-
-/*
- * Xdr operations. XDR_ENCODE causes the type to be encoded into the
- * stream. XDR_DECODE causes the type to be extracted from the stream.
- * XDR_FREE can be used to release the space allocated by an XDR_DECODE
- * request.
- */
-enum xdr_op {
- XDR_ENCODE = 0,
- XDR_DECODE = 1,
- XDR_FREE = 2
-};
-
-/*
- * This is the number of bytes per unit of external data.
- */
-#define BYTES_PER_XDR_UNIT (4)
-#define RNDUP(x) ((((x) + BYTES_PER_XDR_UNIT - 1) / BYTES_PER_XDR_UNIT) \
- * BYTES_PER_XDR_UNIT)
-
-/*
- * The XDR handle.
- * Contains operation which is being applied to the stream,
- * an operations vector for the paticular implementation (e.g. see xdr_mem.c),
- * and two private fields for the use of the particular impelementation.
- *
- * PSARC 2003/523 Contract Private Interface
- * XDR
- * Changes must be reviewed by Solaris File Sharing
- * Changes must be communicated to contract-2003-523@sun.com
- */
-typedef struct XDR {
- enum xdr_op x_op; /* operation; fast additional param */
- struct xdr_ops *x_ops;
- caddr_t x_public; /* users' data */
- caddr_t x_private; /* pointer to private data */
- caddr_t x_base; /* private used for position info */
- int x_handy; /* extra private word */
-} XDR;
-
-/*
- * PSARC 2003/523 Contract Private Interface
- * xdr_ops
- * Changes must be reviewed by Solaris File Sharing
- * Changes must be communicated to contract-2003-523@sun.com
- */
-#ifndef __FreeBSD__
-struct xdr_ops {
-#ifdef __STDC__
-#if !defined(_KERNEL)
- bool_t (*x_getlong)(struct XDR *, long *);
- /* get a long from underlying stream */
- bool_t (*x_putlong)(struct XDR *, long *);
- /* put a long to " */
-#endif /* KERNEL */
- bool_t (*x_getbytes)(struct XDR *, caddr_t, int);
- /* get some bytes from " */
- bool_t (*x_putbytes)(struct XDR *, caddr_t, int);
- /* put some bytes to " */
- uint_t (*x_getpostn)(struct XDR *);
- /* returns bytes off from beginning */
- bool_t (*x_setpostn)(struct XDR *, uint_t);
- /* lets you reposition the stream */
- rpc_inline_t *(*x_inline)(struct XDR *, int);
- /* buf quick ptr to buffered data */
- void (*x_destroy)(struct XDR *);
- /* free privates of this xdr_stream */
- bool_t (*x_control)(struct XDR *, int, void *);
-#if defined(_LP64) || defined(_KERNEL)
- bool_t (*x_getint32)(struct XDR *, int32_t *);
- /* get a int from underlying stream */
- bool_t (*x_putint32)(struct XDR *, int32_t *);
- /* put an int to " */
-#endif /* _LP64 || _KERNEL */
-#else
-#if !defined(_KERNEL)
- bool_t (*x_getlong)(); /* get a long from underlying stream */
- bool_t (*x_putlong)(); /* put a long to " */
-#endif /* KERNEL */
- bool_t (*x_getbytes)(); /* get some bytes from " */
- bool_t (*x_putbytes)(); /* put some bytes to " */
- uint_t (*x_getpostn)(); /* returns bytes off from beginning */
- bool_t (*x_setpostn)(); /* lets you reposition the stream */
- rpc_inline_t *(*x_inline)();
- /* buf quick ptr to buffered data */
- void (*x_destroy)(); /* free privates of this xdr_stream */
- bool_t (*x_control)();
-#if defined(_LP64) || defined(_KERNEL)
- bool_t (*x_getint32)();
- bool_t (*x_putint32)();
-#endif /* _LP64 || defined(_KERNEL) */
-#endif
-};
-
-#else /* FreeBSD */
-struct xdr_ops {
- /* get a long from underlying stream */
- bool_t (*x_getint32)(struct XDR *, int32_t *);
- /* put a long to " */
- bool_t (*x_putint32)(struct XDR *, const int32_t *);
- /* get some bytes from " */
- bool_t (*x_getbytes)(struct XDR *, char *, u_int);
- /* put some bytes to " */
- bool_t (*x_putbytes)(struct XDR *, const char *, u_int);
- /* returns bytes off from beginning */
- u_int (*x_getpostn)(struct XDR *);
- /* lets you reposition the stream */
- bool_t (*x_setpostn)(struct XDR *, u_int);
- /* buf quick ptr to buffered data */
- int32_t *(*x_inline)(struct XDR *, u_int);
- /* free privates of this xdr_stream */
- void (*x_destroy)(struct XDR *);
- bool_t (*x_control)(struct XDR *, int, void *);
-};
-#endif
-
-/*
- * Operations defined on a XDR handle
- *
- * XDR *xdrs;
- * long *longp;
- * caddr_t addr;
- * uint_t len;
- * uint_t pos;
- */
-#if !defined(_KERNEL)
-#define XDR_GETLONG(xdrs, longp) \
- (*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-#define xdr_getlong(xdrs, longp) \
- (*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-
-#define XDR_PUTLONG(xdrs, longp) \
- (*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-#define xdr_putlong(xdrs, longp) \
- (*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-#endif /* KERNEL */
-
-
-#if !defined(_LP64) && !defined(_KERNEL)
-
-/*
- * For binary compatability on ILP32 we do not change the shape
- * of the XDR structure and the GET/PUTINT32 functions just use
- * the get/putlong vectors which operate on identically-sized
- * units of data.
- */
-
-#define XDR_GETINT32(xdrs, int32p) \
- (*(xdrs)->x_ops->x_getlong)(xdrs, (long *)int32p)
-#define xdr_getint32(xdrs, int32p) \
- (*(xdrs)->x_ops->x_getlong)(xdrs, (long *)int32p)
-
-#define XDR_PUTINT32(xdrs, int32p) \
- (*(xdrs)->x_ops->x_putlong)(xdrs, (long *)int32p)
-#define xdr_putint32(xdrs, int32p) \
- (*(xdrs)->x_ops->x_putlong)(xdrs, (long *)int32p)
-
-#else /* !_LP64 && !_KERNEL */
-
-#define XDR_GETINT32(xdrs, int32p) \
- (*(xdrs)->x_ops->x_getint32)(xdrs, int32p)
-#define xdr_getint32(xdrs, int32p) \
- (*(xdrs)->x_ops->x_getint32)(xdrs, int32p)
-
-#define XDR_PUTINT32(xdrs, int32p) \
- (*(xdrs)->x_ops->x_putint32)(xdrs, int32p)
-#define xdr_putint32(xdrs, int32p) \
- (*(xdrs)->x_ops->x_putint32)(xdrs, int32p)
-
-#endif /* !_LP64 && !_KERNEL */
-
-#define XDR_GETBYTES(xdrs, addr, len) \
- (*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-#define xdr_getbytes(xdrs, addr, len) \
- (*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-
-#define XDR_PUTBYTES(xdrs, addr, len) \
- (*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-#define xdr_putbytes(xdrs, addr, len) \
- (*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-
-#define XDR_GETPOS(xdrs) \
- (*(xdrs)->x_ops->x_getpostn)(xdrs)
-#define xdr_getpos(xdrs) \
- (*(xdrs)->x_ops->x_getpostn)(xdrs)
-
-#define XDR_SETPOS(xdrs, pos) \
- (*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-#define xdr_setpos(xdrs, pos) \
- (*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-
-#define XDR_INLINE(xdrs, len) \
- (*(xdrs)->x_ops->x_inline)(xdrs, len)
-#define xdr_inline(xdrs, len) \
- (*(xdrs)->x_ops->x_inline)(xdrs, len)
-
-#define XDR_DESTROY(xdrs) \
- (*(xdrs)->x_ops->x_destroy)(xdrs)
-#define xdr_destroy(xdrs) \
- (*(xdrs)->x_ops->x_destroy)(xdrs)
-
-#define XDR_CONTROL(xdrs, req, op) \
- (*(xdrs)->x_ops->x_control)(xdrs, req, op)
-#define xdr_control(xdrs, req, op) \
- (*(xdrs)->x_ops->x_control)(xdrs, req, op)
-
-/*
- * Support struct for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * a entry with a null procedure pointer. The xdr_union routine gets
- * the discriminant value and then searches the array of structures
- * for a matching value. If a match is found the associated xdr routine
- * is called to handle that part of the union. If there is
- * no match, then a default routine may be called.
- * If there is no match and no default routine it is an error.
- */
-
-
-/*
- * A xdrproc_t exists for each data type which is to be encoded or decoded.
- *
- * The second argument to the xdrproc_t is a pointer to an opaque pointer.
- * The opaque pointer generally points to a structure of the data type
- * to be decoded. If this pointer is 0, then the type routines should
- * allocate dynamic storage of the appropriate size and return it.
- * bool_t (*xdrproc_t)(XDR *, void *);
- */
-#ifdef __cplusplus
-typedef bool_t (*xdrproc_t)(XDR *, void *);
-#else
-#ifdef __STDC__
-typedef bool_t (*xdrproc_t)(); /* For Backward compatibility */
-#else
-typedef bool_t (*xdrproc_t)();
-#endif
-#endif
-
-#define NULL_xdrproc_t ((xdrproc_t)0)
-
-#if defined(_LP64) || defined(_I32LPx)
-#define xdr_rpcvers(xdrs, versp) xdr_u_int(xdrs, versp)
-#define xdr_rpcprog(xdrs, progp) xdr_u_int(xdrs, progp)
-#define xdr_rpcproc(xdrs, procp) xdr_u_int(xdrs, procp)
-#define xdr_rpcprot(xdrs, protp) xdr_u_int(xdrs, protp)
-#define xdr_rpcport(xdrs, portp) xdr_u_int(xdrs, portp)
-#else
-#define xdr_rpcvers(xdrs, versp) xdr_u_long(xdrs, versp)
-#define xdr_rpcprog(xdrs, progp) xdr_u_long(xdrs, progp)
-#define xdr_rpcproc(xdrs, procp) xdr_u_long(xdrs, procp)
-#define xdr_rpcprot(xdrs, protp) xdr_u_long(xdrs, protp)
-#define xdr_rpcport(xdrs, portp) xdr_u_long(xdrs, portp)
-#endif
-
-struct xdr_discrim {
- int value;
- xdrproc_t proc;
-};
-
-/*
- * In-line routines for fast encode/decode of primitve data types.
- * Caveat emptor: these use single memory cycles to get the
- * data from the underlying buffer, and will fail to operate
- * properly if the data is not aligned. The standard way to use these
- * is to say:
- * if ((buf = XDR_INLINE(xdrs, count)) == NULL)
- * return (FALSE);
- * <<< macro calls >>>
- * where ``count'' is the number of bytes of data occupied
- * by the primitive data types.
- *
- * N.B. and frozen for all time: each data type here uses 4 bytes
- * of external representation.
- */
-
-#define IXDR_GET_INT32(buf) ((int32_t)ntohl((uint32_t)*(buf)++))
-#define IXDR_PUT_INT32(buf, v) (*(buf)++ = (int32_t)htonl((uint32_t)v))
-#define IXDR_GET_U_INT32(buf) ((uint32_t)IXDR_GET_INT32(buf))
-#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_INT32((buf), ((int32_t)(v)))
-
-#if !defined(_KERNEL) && !defined(_LP64)
-
-#define IXDR_GET_LONG(buf) ((long)ntohl((ulong_t)*(buf)++))
-#define IXDR_PUT_LONG(buf, v) (*(buf)++ = (long)htonl((ulong_t)v))
-#define IXDR_GET_U_LONG(buf) ((ulong_t)IXDR_GET_LONG(buf))
-#define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG((buf), ((long)(v)))
-
-#define IXDR_GET_BOOL(buf) ((bool_t)IXDR_GET_LONG(buf))
-#define IXDR_GET_ENUM(buf, t) ((t)IXDR_GET_LONG(buf))
-#define IXDR_GET_SHORT(buf) ((short)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_SHORT(buf) ((ushort_t)IXDR_GET_LONG(buf))
-
-#define IXDR_PUT_BOOL(buf, v) IXDR_PUT_LONG((buf), ((long)(v)))
-#define IXDR_PUT_ENUM(buf, v) IXDR_PUT_LONG((buf), ((long)(v)))
-#define IXDR_PUT_SHORT(buf, v) IXDR_PUT_LONG((buf), ((long)(v)))
-#define IXDR_PUT_U_SHORT(buf, v) IXDR_PUT_LONG((buf), ((long)(v)))
-
-#else
-
-#define IXDR_GET_BOOL(buf) ((bool_t)IXDR_GET_INT32(buf))
-#define IXDR_GET_ENUM(buf, t) ((t)IXDR_GET_INT32(buf))
-#define IXDR_GET_SHORT(buf) ((short)IXDR_GET_INT32(buf))
-#define IXDR_GET_U_SHORT(buf) ((ushort_t)IXDR_GET_INT32(buf))
-
-#define IXDR_PUT_BOOL(buf, v) IXDR_PUT_INT32((buf), ((int)(v)))
-#define IXDR_PUT_ENUM(buf, v) IXDR_PUT_INT32((buf), ((int)(v)))
-#define IXDR_PUT_SHORT(buf, v) IXDR_PUT_INT32((buf), ((int)(v)))
-#define IXDR_PUT_U_SHORT(buf, v) IXDR_PUT_INT32((buf), ((int)(v)))
-
-#endif
-
-#if BYTE_ORDER == _LITTLE_ENDIAN
-#define IXDR_GET_HYPER(buf, v) { \
- *((int32_t *)(&v)) = ntohl(*(uint32_t *)buf++); \
- *((int32_t *)(((char *)&v) + BYTES_PER_XDR_UNIT)) \
- = ntohl(*(uint32_t *)buf++); \
- }
-#define IXDR_PUT_HYPER(buf, v) { \
- *(buf)++ = (int32_t)htonl(*(uint32_t *) \
- ((char *)&v)); \
- *(buf)++ = \
- (int32_t)htonl(*(uint32_t *)(((char *)&v) \
- + BYTES_PER_XDR_UNIT)); \
- }
-#else
-
-#define IXDR_GET_HYPER(buf, v) { \
- *((int32_t *)(((char *)&v) + \
- BYTES_PER_XDR_UNIT)) \
- = ntohl(*(uint32_t *)buf++); \
- *((int32_t *)(&v)) = \
- ntohl(*(uint32_t *)buf++); \
- }
-
-#define IXDR_PUT_HYPER(buf, v) { \
- *(buf)++ = \
- (int32_t)htonl(*(uint32_t *)(((char *)&v) + \
- BYTES_PER_XDR_UNIT)); \
- *(buf)++ = \
- (int32_t)htonl(*(uint32_t *)((char *)&v)); \
- }
-#endif
-#define IXDR_GET_U_HYPER(buf, v) IXDR_GET_HYPER(buf, v)
-#define IXDR_PUT_U_HYPER(buf, v) IXDR_PUT_HYPER(buf, v)
-
-
-/*
- * These are the "generic" xdr routines.
- */
-#ifdef __STDC__
-extern bool_t xdr_void(void);
-extern bool_t xdr_int(XDR *, int *);
-extern bool_t xdr_u_int(XDR *, uint_t *);
-extern bool_t xdr_long(XDR *, long *);
-extern bool_t xdr_u_long(XDR *, ulong_t *);
-extern bool_t xdr_short(XDR *, short *);
-extern bool_t xdr_u_short(XDR *, ushort_t *);
-extern bool_t xdr_bool(XDR *, bool_t *);
-extern bool_t xdr_enum(XDR *, enum_t *);
-extern bool_t xdr_array(XDR *, caddr_t *, uint_t *, const uint_t,
- const uint_t, const xdrproc_t);
-extern bool_t xdr_bytes(XDR *, char **, uint_t *, const uint_t);
-extern bool_t xdr_opaque(XDR *, caddr_t, const uint_t);
-extern bool_t xdr_string(XDR *, char **, const uint_t);
-extern bool_t xdr_union(XDR *, enum_t *, char *,
- const struct xdr_discrim *, const xdrproc_t);
-extern unsigned int xdr_sizeof(xdrproc_t, void *);
-
-extern bool_t xdr_hyper(XDR *, longlong_t *);
-extern bool_t xdr_longlong_t(XDR *, longlong_t *);
-extern bool_t xdr_u_hyper(XDR *, u_longlong_t *);
-extern bool_t xdr_u_longlong_t(XDR *, u_longlong_t *);
-
-extern bool_t xdr_char(XDR *, char *);
-extern bool_t xdr_wrapstring(XDR *, char **);
-extern bool_t xdr_reference(XDR *, caddr_t *, uint_t, const xdrproc_t);
-extern bool_t xdr_pointer(XDR *, char **, uint_t, const xdrproc_t);
-extern void xdr_free(xdrproc_t, char *);
-extern bool_t xdr_time_t(XDR *, time_t *);
-
-extern bool_t xdr_int8_t(XDR *, int8_t *);
-extern bool_t xdr_uint8_t(XDR *, uint8_t *);
-extern bool_t xdr_int16_t(XDR *, int16_t *);
-extern bool_t xdr_uint16_t(XDR *, uint16_t *);
-extern bool_t xdr_int32_t(XDR *, int32_t *);
-extern bool_t xdr_uint32_t(XDR *, uint32_t *);
-#if defined(_INT64_TYPE)
-extern bool_t xdr_int64_t(XDR *, int64_t *);
-extern bool_t xdr_uint64_t(XDR *, uint64_t *);
-#endif
-
-#ifndef _KERNEL
-extern bool_t xdr_u_char(XDR *, uchar_t *);
-extern bool_t xdr_vector(XDR *, char *, const uint_t, const uint_t, const
-xdrproc_t);
-extern bool_t xdr_float(XDR *, float *);
-extern bool_t xdr_double(XDR *, double *);
-extern bool_t xdr_quadruple(XDR *, long double *);
-#endif /* !_KERNEL */
-#else
-extern bool_t xdr_void();
-extern bool_t xdr_int();
-extern bool_t xdr_u_int();
-extern bool_t xdr_long();
-extern bool_t xdr_u_long();
-extern bool_t xdr_short();
-extern bool_t xdr_u_short();
-extern bool_t xdr_bool();
-extern bool_t xdr_enum();
-extern bool_t xdr_array();
-extern bool_t xdr_bytes();
-extern bool_t xdr_opaque();
-extern bool_t xdr_string();
-extern bool_t xdr_union();
-
-extern bool_t xdr_hyper();
-extern bool_t xdr_longlong_t();
-extern bool_t xdr_u_hyper();
-extern bool_t xdr_u_longlong_t();
-extern bool_t xdr_char();
-extern bool_t xdr_reference();
-extern bool_t xdr_pointer();
-extern void xdr_free();
-extern bool_t xdr_wrapstring();
-extern bool_t xdr_time_t();
-
-extern bool_t xdr_int8_t();
-extern bool_t xdr_uint8_t();
-extern bool_t xdr_int16_t();
-extern bool_t xdr_uint16_t();
-extern bool_t xdr_int32_t();
-extern bool_t xdr_uint32_t();
-#if defined(_INT64_TYPE)
-extern bool_t xdr_int64_t();
-extern bool_t xdr_uint64_t();
-#endif
-
-#ifndef _KERNEL
-extern bool_t xdr_u_char();
-extern bool_t xdr_vector();
-extern bool_t xdr_float();
-extern bool_t xdr_double();
-extern bool_t xdr_quadruple();
-#endif /* !_KERNEL */
-#endif
-
-/*
- * Common opaque bytes objects used by many rpc protocols;
- * declared here due to commonality.
- */
-#define MAX_NETOBJ_SZ 1024
-struct netobj {
- uint_t n_len;
- char *n_bytes;
-};
-typedef struct netobj netobj;
-
-#ifdef __STDC__
-extern bool_t xdr_netobj(XDR *, netobj *);
-#else
-extern bool_t xdr_netobj();
-#endif
-
-/*
- * These are XDR control operators
- */
-
-#define XDR_GET_BYTES_AVAIL 1
-
-struct xdr_bytesrec {
- bool_t xc_is_last_record;
- size_t xc_num_avail;
-};
-
-typedef struct xdr_bytesrec xdr_bytesrec;
-
-/*
- * These are the request arguments to XDR_CONTROL.
- *
- * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream.
- * XDR_SKIPBYTES - skips the next N bytes in the XDR stream.
- * XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from
- * the XDR stream being moved over RDMA
- * XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in
- * the XDR stream moving over RDMA.
- */
-#ifdef _KERNEL
-#define XDR_PEEK 2
-#define XDR_SKIPBYTES 3
-#define XDR_RDMA_GET_FLAGS 4
-#define XDR_RDMA_SET_FLAGS 5
-#define XDR_RDMA_ADD_CHUNK 6
-#define XDR_RDMA_GET_CHUNK_LEN 7
-#define XDR_RDMA_SET_WLIST 8
-#define XDR_RDMA_GET_WLIST 9
-#define XDR_RDMA_GET_WCINFO 10
-#define XDR_RDMA_GET_RLIST 11
-#endif
-
-/*
- * These are the public routines for the various implementations of
- * xdr streams.
- */
-#ifndef _KERNEL
-#ifdef __STDC__
-extern void xdrmem_create(XDR *, const caddr_t, const uint_t, const enum
-xdr_op);
- /* XDR using memory buffers */
-extern void xdrrec_create(XDR *, const uint_t, const uint_t, const caddr_t,
-int (*) (void *, caddr_t, int), int (*) (void *, caddr_t, int));
-/* XDR pseudo records for tcp */
-extern bool_t xdrrec_endofrecord(XDR *, bool_t);
-/* make end of xdr record */
-extern bool_t xdrrec_skiprecord(XDR *);
-/* move to beginning of next record */
-extern bool_t xdrrec_eof(XDR *);
-extern uint_t xdrrec_readbytes(XDR *, caddr_t, uint_t);
-/* true if no more input */
-#else
-extern void xdrmem_create();
-extern void xdrstdio_create();
-extern void xdrrec_create();
-extern bool_t xdrrec_endofrecord();
-extern bool_t xdrrec_skiprecord();
-extern bool_t xdrrec_eof();
-extern uint_t xdrrec_readbytes();
-#endif
-#else
-
-extern void xdrmem_create(XDR *, caddr_t, uint_t, enum xdr_op);
-extern struct xdr_ops xdrmblk_ops;
-extern struct xdr_ops xdrrdmablk_ops;
-extern struct xdr_ops xdrrdma_ops;
-
-struct rpc_msg;
-extern bool_t xdr_callmsg(XDR *, struct rpc_msg *);
-extern bool_t xdr_replymsg_body(XDR *, struct rpc_msg *);
-extern bool_t xdr_replymsg_hdr(XDR *, struct rpc_msg *);
-
-#include <sys/malloc.h>
-#ifdef mem_alloc
-#undef mem_alloc
-#define mem_alloc(size) malloc((size), M_TEMP, M_WAITOK | M_ZERO)
-#endif
-#ifdef mem_free
-#undef mem_free
-#define mem_free(ptr, size) free((ptr), M_TEMP)
-#endif
-
-#endif /* !_KERNEL */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RPC_XDR_H */
--
cgit v1.2.3