Libinfo-392.1.tar.gz

[apple/libinfo.git] / rpc.subproj / xdr_rec.c

diff --git a/rpc.subproj/xdr_rec.c b/rpc.subproj/xdr_rec.c
index 617f69a884725962d7a317d269cfc1df1448bc85..77fffecf074483f4d8c5f076752aa8bb3c1354f6 100644 (file)
--- a/rpc.subproj/xdr_rec.c
+++ b/rpc.subproj/xdr_rec.c
@@ -3,25 +3,27 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
+ * Reserved.  This file contains Original Code and/or Modifications of
+ * Original Code as defined in and that are subject to the Apple Public
+ * Source License Version 1.1 (the "License").  You may not use this file
+ * except in compliance with the License.  Please obtain a copy of the
+ * License at http://www.apple.com/publicsource and read it before using
+ * this file.

  * 
  * The Original Code and all software distributed under the License are
  * 
  * The Original Code and all software distributed under the License are

- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */

+
+/*     $NetBSD: xdr_rec.c,v 1.18 2000/07/06 03:10:35 christos Exp $    */
+

 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape


@@ -29,32 +31,34 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.

- * 
+ *

  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.

- * 
+ *

  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.

- * 
+ *

  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.

- * 
+ *

  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.

- * 
+ *

  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */

+
+#include <sys/cdefs.h>

 #if defined(LIBC_SCCS) && !defined(lint) 
 #if defined(LIBC_SCCS) && !defined(lint) 

-/*static char *sccsid = "from: @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
-/*static char *sccsid = "from: @(#)xdr_rec.c   2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_rec.c,v 1.4 2003/06/23 17:24:59 majka Exp $";
+static char *sccsid = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";
+static char *sccsid = "@(#)xdr_rec.c   2.2 88/08/01 4.0 RPCSRC";

 #endif
 #endif

+#include <sys/cdefs.h>

 
 /*
  * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
 
 /*
  * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"


@@ -67,36 +71,47 @@ static char *rcsid = "$Id: xdr_rec.c,v 1.4 2003/06/23 17:24:59 majka Exp $";
  * and the tcp transport level.  A record is composed on one or more
  * record fragments.  A record fragment is a thirty-two bit header followed
  * by n bytes of data, where n is contained in the header.  The header
  * and the tcp transport level.  A record is composed on one or more
  * record fragments.  A record fragment is a thirty-two bit header followed
  * by n bytes of data, where n is contained in the header.  The header

- * is represented as a htonl(u_long).  Thegh order bit encodes
+ * is in network byte order.  Thegh order bit encodes

  * whether or not the fragment is the last fragment of the record
  * (1 => fragment is last, 0 => more fragments to follow. 
  * The other 31 bits encode the byte length of the fragment.
  */
 
  * whether or not the fragment is the last fragment of the record
  * (1 => fragment is last, 0 => more fragments to follow. 
  * The other 31 bits encode the byte length of the fragment.
  */
 

+#include <sys/types.h>
+
+#include <netinet/in.h>
+
+#include <err.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

+

 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <rpc/types.h>
 #include <rpc/xdr.h>

-#include <netinet/in.h>
+#include <rpc/auth.h>
+#include <rpc/svc.h>
+#include <rpc/clnt.h>
+
+#ifdef __LP64__
+static bool_t  xdrrec_getlong(XDR *, int *);
+static bool_t  xdrrec_putlong(XDR *, const int *);
+#else
+static bool_t  xdrrec_getlong(XDR *, long *);
+static bool_t  xdrrec_putlong(XDR *, const long *);
+#endif
+
+static bool_t  xdrrec_getbytes(XDR *, char *, u_int);

 
 

-static u_int   fix_buf_size();
-static bool_t  flush_out();
-static bool_t  get_input_bytes();
-static bool_t  set_input_fragment();
-static bool_t  skip_input_bytes();
-
-static bool_t  xdrrec_getlong();
-static bool_t  xdrrec_putlong();
-static bool_t  xdrrec_getbytes();
-static bool_t  xdrrec_putbytes();
-static u_int   xdrrec_getpos();
-static bool_t  xdrrec_setpos();
-static long *  xdrrec_inline();
-static void    xdrrec_destroy();
-
-static struct  xdr_ops xdrrec_ops = {
+static bool_t  xdrrec_putbytes(XDR *, const char *, u_int);
+static u_int   xdrrec_getpos(XDR *);
+static bool_t  xdrrec_setpos(XDR *, u_int);
+static int32_t *xdrrec_inline(XDR *, u_int);
+static void    xdrrec_destroy(XDR *);
+
+bool_t __xdrrec_getrec(XDR *, enum xprt_stat *, bool_t);
+
+static const struct  xdr_ops xdrrec_ops = {

        xdrrec_getlong,
        xdrrec_putlong,
        xdrrec_getbytes,
        xdrrec_getlong,
        xdrrec_putlong,
        xdrrec_getbytes,


@@ -109,8 +124,8 @@ static struct  xdr_ops xdrrec_ops = {
 
 /*
  * A record is composed of one or more record fragments.
 
 /*
  * A record is composed of one or more record fragments.

- * A record fragment is a two-byte header followed by zero to
- * 2**32-1 bytes.  The header is treated as a long unsigned and is
+ * A record fragment is a four-byte header followed by zero to
+ * 2**32-1 bytes.  The header is treated as an unsigned 32-bit integer and is

  * encode/decoded to the network via htonl/ntohl.  The low order 31 bits
  * are a byte count of the fragment.  The highest order bit is a boolean:
  * 1 => this fragment is the last fragment of the record,
  * encode/decoded to the network via htonl/ntohl.  The low order 31 bits
  * are a byte count of the fragment.  The highest order bit is a boolean:
  * 1 => this fragment is the last fragment of the record,


@@ -120,34 +135,50 @@ static struct  xdr_ops xdrrec_ops = {
  * meet the needs of xdr and rpc based on tcp.
  */
 
  * meet the needs of xdr and rpc based on tcp.
  */
 

-#define LAST_FRAG ((u_long)(1 << 31))
+#define LAST_FRAG ((u_int32_t)(1 << 31))

 
 typedef struct rec_strm {
 
 typedef struct rec_strm {

-       caddr_t tcp_handle;
-       caddr_t the_buffer;
+       void *tcp_handle;

        /*
         * out-goung bits
         */
        /*
         * out-goung bits
         */

-       int (*writeit)();
-       caddr_t out_base;       /* output buffer (points to frag header) */
-       caddr_t out_finger;     /* next output position */
-       caddr_t out_boundry;    /* data cannot up to this address */
-       u_long *frag_header;    /* beginning of curren fragment */
+       int (*writeit)(void *, void *, int);
+       char *out_base; /* output buffer (points to frag header) */
+       char *out_finger;       /* next output position */
+       char *out_boundry;      /* data cannot up to this address */
+       u_int32_t *frag_header; /* beginning of curren fragment */

        bool_t frag_sent;       /* true if buffer sent in middle of record */
        /*
         * in-coming bits
         */
        bool_t frag_sent;       /* true if buffer sent in middle of record */
        /*
         * in-coming bits
         */

-       int (*readit)();
-       u_long in_size; /* fixed size of the input buffer */
-       caddr_t in_base;
-       caddr_t in_finger;      /* location of next byte to be had */
-       caddr_t in_boundry;     /* can read up to this location */
-       long fbtbc;             /* fragment bytes to be consumed */
+       int (*readit)(void *, void *, int);
+       size_t in_size; /* fixed size of the input buffer */
+       char *in_base;
+       char *in_finger;        /* location of next byte to be had */
+       char *in_boundry;       /* can read up to this location */
+       int fbtbc;              /* fragment bytes to be consumed */

        bool_t last_frag;
        u_int sendsize;
        u_int recvsize;
        bool_t last_frag;
        u_int sendsize;
        u_int recvsize;

+
+       bool_t nonblock;
+       bool_t in_haveheader;
+       u_int32_t in_header;
+       char *in_hdrp;
+       int in_hdrlen;
+       int in_reclen;
+       int in_received;
+       int in_maxrec;

 } RECSTREAM;
 
 } RECSTREAM;
 

+static u_int   fix_buf_size(u_int);
+static bool_t  flush_out(RECSTREAM *, bool_t);
+static bool_t  fill_input_buf(RECSTREAM *);
+static bool_t  get_input_bytes(RECSTREAM *, char *, int);
+static bool_t  set_input_fragment(RECSTREAM *);
+static bool_t  skip_input_bytes(RECSTREAM *, int);
+static bool_t  realloc_stream(RECSTREAM *, int);
+

 
 /*
  * Create an xdr handle for xdrrec
 
 /*
  * Create an xdr handle for xdrrec


@@ -160,49 +191,51 @@ typedef struct rec_strm {
  */
 void
 xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit)
  */
 void
 xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit)

-       register XDR *xdrs;
-       register u_int sendsize;
-       register u_int recvsize;
-       caddr_t tcp_handle;
-       int (*readit)();  /* like read, but pass it a tcp_handle, not sock */
-       int (*writeit)();  /* like write, but pass it a tcp_handle, not sock */
+       XDR *xdrs;
+       u_int sendsize;
+       u_int recvsize;
+       void *tcp_handle;
+       /* like read, but pass it a tcp_handle, not sock */
+       int (*readit)(void *, void *, int);
+       /* like write, but pass it a tcp_handle, not sock */
+       int (*writeit)(void *, void *, int);

 {
 {

-       register RECSTREAM *rstrm =
-               (RECSTREAM *)mem_alloc(sizeof(RECSTREAM));
+       RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM));

 
        if (rstrm == NULL) {
 
        if (rstrm == NULL) {

-               (void)fprintf(stderr, "xdrrec_create: out of memory\n");
+               warnx("xdrrec_create: out of memory");

                /* 
                 *  This is bad.  Should rework xdrrec_create to 
                 *  return a handle, and in this case return NULL
                 */
                return;
        }
                /* 
                 *  This is bad.  Should rework xdrrec_create to 
                 *  return a handle, and in this case return NULL
                 */
                return;
        }

-       /*
-        * adjust sizes and allocate buffer quad byte aligned
-        */

        rstrm->sendsize = sendsize = fix_buf_size(sendsize);
        rstrm->sendsize = sendsize = fix_buf_size(sendsize);

+       rstrm->out_base = mem_alloc(rstrm->sendsize);
+       if (rstrm->out_base == NULL) {
+               warnx("xdrrec_create: out of memory");
+               mem_free(rstrm, sizeof(RECSTREAM));
+               return;
+       }

        rstrm->recvsize = recvsize = fix_buf_size(recvsize);
        rstrm->recvsize = recvsize = fix_buf_size(recvsize);

-       rstrm->the_buffer = mem_alloc(sendsize + recvsize + BYTES_PER_XDR_UNIT);
-       if (rstrm->the_buffer == NULL) {
-               (void)fprintf(stderr, "xdrrec_create: out of memory\n");
+       rstrm->in_base = mem_alloc(recvsize);
+       if (rstrm->in_base == NULL) {
+               warnx("xdrrec_create: out of memory");
+               mem_free(rstrm->out_base, sendsize);
+               mem_free(rstrm, sizeof(RECSTREAM));

                return;
        }
                return;
        }

-       for (rstrm->out_base = rstrm->the_buffer;
-               (u_int)rstrm->out_base % BYTES_PER_XDR_UNIT != 0;
-               rstrm->out_base++);
-       rstrm->in_base = rstrm->out_base + sendsize;

        /*
         * now the rest ...
         */
        xdrs->x_ops = &xdrrec_ops;
        /*
         * now the rest ...
         */
        xdrs->x_ops = &xdrrec_ops;

-       xdrs->x_private = (caddr_t)rstrm;
+       xdrs->x_private = rstrm;

        rstrm->tcp_handle = tcp_handle;
        rstrm->readit = readit;
        rstrm->writeit = writeit;
        rstrm->out_finger = rstrm->out_boundry = rstrm->out_base;
        rstrm->tcp_handle = tcp_handle;
        rstrm->readit = readit;
        rstrm->writeit = writeit;
        rstrm->out_finger = rstrm->out_boundry = rstrm->out_base;

-       rstrm->frag_header = (u_long *)rstrm->out_base;
-       rstrm->out_finger += sizeof(u_long);
+       rstrm->frag_header = (u_int32_t *)(void *)rstrm->out_base;
+       rstrm->out_finger += sizeof(u_int32_t);

        rstrm->out_boundry += sendsize;
        rstrm->frag_sent = FALSE;
        rstrm->in_size = recvsize;
        rstrm->out_boundry += sendsize;
        rstrm->frag_sent = FALSE;
        rstrm->in_size = recvsize;


@@ -210,6 +243,12 @@ xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit)
        rstrm->in_finger = (rstrm->in_boundry += recvsize);
        rstrm->fbtbc = 0;
        rstrm->last_frag = TRUE;
        rstrm->in_finger = (rstrm->in_boundry += recvsize);
        rstrm->fbtbc = 0;
        rstrm->last_frag = TRUE;

+       rstrm->in_haveheader = FALSE;
+       rstrm->in_hdrlen = 0;
+       rstrm->in_hdrp = (char *)(void *)&rstrm->in_header;
+       rstrm->nonblock = FALSE;
+       rstrm->in_reclen = 0;
+       rstrm->in_received = 0;

 }
 
 
 }
 
 


@@ -221,61 +260,72 @@ xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit)
 static bool_t
 xdrrec_getlong(xdrs, lp)
        XDR *xdrs;
 static bool_t
 xdrrec_getlong(xdrs, lp)
        XDR *xdrs;

+#ifdef __LP64__
+       int *lp;
+#else

        long *lp;
        long *lp;

+#endif

 {
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-       register long *buflp = (long *)(rstrm->in_finger);
-       long mylong;
+       RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+       int32_t *buflp = (int32_t *)(void *)(rstrm->in_finger);
+       int32_t mylong;

 
        /* first try the inline, fast case */
 
        /* first try the inline, fast case */

-       if ((rstrm->fbtbc >= sizeof(long)) &&
-               (((int)rstrm->in_boundry - (int)buflp) >= sizeof(long))) {
-               *lp = (long)ntohl((u_long)(*buflp));
-               rstrm->fbtbc -= sizeof(long);
-               rstrm->in_finger += sizeof(long);
-       } else {
-               if (! xdrrec_getbytes(xdrs, (caddr_t)&mylong, sizeof(long)))
-                       return (FALSE);
-               *lp = (long)ntohl((u_long)mylong);
+       if ((rstrm->fbtbc >= sizeof(int32_t)) && ((rstrm->in_boundry - (char *)buflp) >= sizeof(int32_t)))
+       {
+               *lp = ntohl(*buflp);
+               rstrm->fbtbc -= sizeof(int32_t);
+               rstrm->in_finger += sizeof(int32_t);
+       }
+       else
+       {
+               if (! xdrrec_getbytes(xdrs, (char *)(void *)&mylong, sizeof(int32_t))) return (FALSE);
+               *lp = ntohl(mylong);

        }
        }

+

        return (TRUE);
 }
 
 static bool_t
 xdrrec_putlong(xdrs, lp)
        XDR *xdrs;
        return (TRUE);
 }
 
 static bool_t
 xdrrec_putlong(xdrs, lp)
        XDR *xdrs;

-       long *lp;
+#ifdef __LP64__
+       const int *lp;
+#else
+       const long *lp;
+#endif

 {
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-       register long *dest_lp = ((long *)(rstrm->out_finger));
+       RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+       int32_t *dest_lp = ((int32_t *)(void *)(rstrm->out_finger));

 
 

-       if ((rstrm->out_finger += sizeof(long)) > rstrm->out_boundry) {
+       if ((rstrm->out_finger += sizeof(int32_t)) > rstrm->out_boundry)
+       {

                /*
                 * this case should almost never happen so the code is
                 * inefficient
                 */
                /*
                 * this case should almost never happen so the code is
                 * inefficient
                 */

-               rstrm->out_finger -= sizeof(long);
+               rstrm->out_finger -= sizeof(int32_t);

                rstrm->frag_sent = TRUE;
                rstrm->frag_sent = TRUE;

-               if (! flush_out(rstrm, FALSE))
-                       return (FALSE);
-               dest_lp = ((long *)(rstrm->out_finger));
-               rstrm->out_finger += sizeof(long);
+               if (! flush_out(rstrm, FALSE)) return (FALSE);
+               dest_lp = ((int32_t *)(void *)(rstrm->out_finger));
+               rstrm->out_finger += sizeof(int32_t);

        }
        }

-       *dest_lp = (long)htonl((u_long)(*lp));
+
+       *dest_lp = htonl(*lp);

        return (TRUE);
 }
 
 static bool_t  /* must manage buffers, fragments, and records */
 xdrrec_getbytes(xdrs, addr, len)
        XDR *xdrs;
        return (TRUE);
 }
 
 static bool_t  /* must manage buffers, fragments, and records */
 xdrrec_getbytes(xdrs, addr, len)
        XDR *xdrs;

-       register caddr_t addr;
-       register u_int len;
+       char *addr;
+       u_int len;

 {
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-       register int current;
+       RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+       int current;

 
        while (len > 0) {
 
        while (len > 0) {

-               current = rstrm->fbtbc;
+               current = (int)rstrm->fbtbc;

                if (current == 0) {
                        if (rstrm->last_frag)
                                return (FALSE);
                if (current == 0) {
                        if (rstrm->last_frag)
                                return (FALSE);


@@ -296,16 +346,16 @@ xdrrec_getbytes(xdrs, addr, len)
 static bool_t
 xdrrec_putbytes(xdrs, addr, len)
        XDR *xdrs;
 static bool_t
 xdrrec_putbytes(xdrs, addr, len)
        XDR *xdrs;

-       register caddr_t addr;
-       register u_int len;
+       const char *addr;
+       u_int len;

 {
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-       register int current;
+       RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+       size_t current;

 
        while (len > 0) {
 
        while (len > 0) {

-               current = (u_int)rstrm->out_boundry - (u_int)rstrm->out_finger;
+               current = (size_t)(rstrm->out_boundry - rstrm->out_finger);

                current = (len < current) ? len : current;
                current = (len < current) ? len : current;

-               bcopy(addr, rstrm->out_finger, current);
+               memmove(rstrm->out_finger, addr, current);

                rstrm->out_finger += current;
                addr += current;
                len -= current;
                rstrm->out_finger += current;
                addr += current;
                len -= current;


@@ -320,12 +370,17 @@ xdrrec_putbytes(xdrs, addr, len)
 
 static u_int
 xdrrec_getpos(xdrs)
 
 static u_int
 xdrrec_getpos(xdrs)

-       register XDR *xdrs;
+       XDR *xdrs;

 {
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-       register long pos;
+       RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+       off_t pos;
+       int hfd;
+
+       /* tcp_handle is in actual fact just a file descriptor */
+       hfd = 0;
+       memcpy(&hfd, rstrm->tcp_handle, sizeof(hfd));

 
 

-       pos = lseek((int)rstrm->tcp_handle, 0, 1);
+       pos = lseek(hfd, 0, 1);

        if (pos != -1)
                switch (xdrs->x_op) {
 
        if (pos != -1)
                switch (xdrs->x_op) {
 


@@ -338,7 +393,7 @@ xdrrec_getpos(xdrs)
                        break;
 
                default:
                        break;
 
                default:

-                       pos = (u_int) -1;
+                       pos = (off_t) -1;

                        break;
                }
        return ((u_int) pos);
                        break;
                }
        return ((u_int) pos);


@@ -346,20 +401,20 @@ xdrrec_getpos(xdrs)
 
 static bool_t
 xdrrec_setpos(xdrs, pos)
 
 static bool_t
 xdrrec_setpos(xdrs, pos)

-       register XDR *xdrs;
+       XDR *xdrs;

        u_int pos;
 {
        u_int pos;
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+       RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;

        u_int currpos = xdrrec_getpos(xdrs);
        int delta = currpos - pos;
        u_int currpos = xdrrec_getpos(xdrs);
        int delta = currpos - pos;

-       caddr_t newpos;
+       char *newpos;

 
        if ((int)currpos != -1)
                switch (xdrs->x_op) {
 
                case XDR_ENCODE:
                        newpos = rstrm->out_finger - delta;
 
        if ((int)currpos != -1)
                switch (xdrs->x_op) {
 
                case XDR_ENCODE:
                        newpos = rstrm->out_finger - delta;

-                       if ((newpos > (caddr_t)(rstrm->frag_header)) &&
+                       if ((newpos > (char *)(void *)(rstrm->frag_header)) &&

                                (newpos < rstrm->out_boundry)) {
                                rstrm->out_finger = newpos;
                                return (TRUE);
                                (newpos < rstrm->out_boundry)) {
                                rstrm->out_finger = newpos;
                                return (TRUE);


@@ -376,24 +431,26 @@ xdrrec_setpos(xdrs, pos)
                                return (TRUE);
                        }
                        break;
                                return (TRUE);
                        }
                        break;

-               default: break;
+
+               case XDR_FREE:
+                       break;

                }
        return (FALSE);
 }
 
                }
        return (FALSE);
 }
 

-static long *
+static int32_t *

 xdrrec_inline(xdrs, len)
 xdrrec_inline(xdrs, len)

-       register XDR *xdrs;
-       int len;
+       XDR *xdrs;
+       u_int len;

 {
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-       long * buf = NULL;
+       RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+       int32_t *buf = NULL;

 
        switch (xdrs->x_op) {
 
        case XDR_ENCODE:
                if ((rstrm->out_finger + len) <= rstrm->out_boundry) {
 
        switch (xdrs->x_op) {
 
        case XDR_ENCODE:
                if ((rstrm->out_finger + len) <= rstrm->out_boundry) {

-                       buf = (long *) rstrm->out_finger;
+                       buf = (int32_t *)(void *)rstrm->out_finger;

                        rstrm->out_finger += len;
                }
                break;
                        rstrm->out_finger += len;
                }
                break;


@@ -401,25 +458,27 @@ xdrrec_inline(xdrs, len)
        case XDR_DECODE:
                if ((len <= rstrm->fbtbc) &&
                        ((rstrm->in_finger + len) <= rstrm->in_boundry)) {
        case XDR_DECODE:
                if ((len <= rstrm->fbtbc) &&
                        ((rstrm->in_finger + len) <= rstrm->in_boundry)) {

-                       buf = (long *) rstrm->in_finger;
+                       buf = (int32_t *)(void *)rstrm->in_finger;

                        rstrm->fbtbc -= len;
                        rstrm->in_finger += len;
                }
                break;
                        rstrm->fbtbc -= len;
                        rstrm->in_finger += len;
                }
                break;

-       default: break;
+
+       case XDR_FREE:
+               break;

        }
        return (buf);
 }
 
 static void
 xdrrec_destroy(xdrs)
        }
        return (buf);
 }
 
 static void
 xdrrec_destroy(xdrs)

-       register XDR *xdrs;
+       XDR *xdrs;

 {
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
+       RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;

 
 

-       mem_free(rstrm->the_buffer,
-               rstrm->sendsize + rstrm->recvsize + BYTES_PER_XDR_UNIT);
-       mem_free((caddr_t)rstrm, sizeof(RECSTREAM));
+       mem_free(rstrm->out_base, rstrm->sendsize);
+       mem_free(rstrm->in_base, rstrm->recvsize);
+       mem_free(rstrm, sizeof(RECSTREAM));

 }
 
 
 }
 
 


@@ -435,7 +494,21 @@ bool_t
 xdrrec_skiprecord(xdrs)
        XDR *xdrs;
 {
 xdrrec_skiprecord(xdrs)
        XDR *xdrs;
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+       RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+       enum xprt_stat xstat;
+
+       if (rstrm->nonblock) {
+               if (__xdrrec_getrec(xdrs, &xstat, FALSE)) {
+                       rstrm->fbtbc = 0;
+                       return TRUE;
+               }
+               if (rstrm->in_finger == rstrm->in_boundry &&
+                   xstat == XPRT_MOREREQS) {
+                       rstrm->fbtbc = 0;
+                       return TRUE;
+               }
+               return FALSE;
+       }

 
        while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
                if (! skip_input_bytes(rstrm, rstrm->fbtbc))
 
        while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
                if (! skip_input_bytes(rstrm, rstrm->fbtbc))


@@ -449,15 +522,15 @@ xdrrec_skiprecord(xdrs)
 }
 
 /*
 }
 
 /*

- * Look ahead fuction.
- * Returns TRUE iff there is no more input in the buffer 
+ * Look ahead function.
+ * Returns TRUE iff there is no more input in the buffer

  * after consuming the rest of the current record.
  */
 bool_t
 xdrrec_eof(xdrs)
        XDR *xdrs;
 {
  * after consuming the rest of the current record.
  */
 bool_t
 xdrrec_eof(xdrs)
        XDR *xdrs;
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+       RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);

 
        while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
                if (! skip_input_bytes(rstrm, rstrm->fbtbc))
 
        while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
                if (! skip_input_bytes(rstrm, rstrm->fbtbc))


@@ -482,56 +555,149 @@ xdrrec_endofrecord(xdrs, sendnow)
        XDR *xdrs;
        bool_t sendnow;
 {
        XDR *xdrs;
        bool_t sendnow;
 {

-       register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-       register u_long len;  /* fragment length */
+       RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+       unsigned int len;  /* fragment length */

 
        if (sendnow || rstrm->frag_sent ||
 
        if (sendnow || rstrm->frag_sent ||

-               ((u_long)rstrm->out_finger + sizeof(u_long) >=
-               (u_long)rstrm->out_boundry)) {
+               (rstrm->out_finger + sizeof(u_int32_t) >= rstrm->out_boundry)) {

                rstrm->frag_sent = FALSE;
                return (flush_out(rstrm, TRUE));
        }
                rstrm->frag_sent = FALSE;
                return (flush_out(rstrm, TRUE));
        }

-       len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->frag_header) -
-          sizeof(u_long);
-       *(rstrm->frag_header) = htonl((u_long)len | LAST_FRAG);
-       rstrm->frag_header = (u_long *)rstrm->out_finger;
-       rstrm->out_finger += sizeof(u_long);
+       len = rstrm->out_finger - (char *)(rstrm->frag_header) - sizeof(u_int32_t);
+       *(rstrm->frag_header) = htonl(len | LAST_FRAG);
+       rstrm->frag_header = (u_int32_t *)(void *)rstrm->out_finger;
+       rstrm->out_finger += sizeof(u_int32_t);

        return (TRUE);
 }
 
        return (TRUE);
 }
 

+/*
+ * Fill the stream buffer with a record for a non-blocking connection.
+ * Return true if a record is available in the buffer, false if not.
+ */
+bool_t
+__xdrrec_getrec(xdrs, statp, expectdata)
+       XDR *xdrs;
+       enum xprt_stat *statp;
+       bool_t expectdata;
+{
+       RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+       ssize_t n;
+       int fraglen;
+
+       if (!rstrm->in_haveheader) {
+               n = rstrm->readit(rstrm->tcp_handle, rstrm->in_hdrp,
+                   (int)sizeof (rstrm->in_header) - rstrm->in_hdrlen);
+               if (n == 0) {
+                       *statp = expectdata ? XPRT_DIED : XPRT_IDLE;
+                       return FALSE;
+               }
+               if (n < 0) {
+                       *statp = XPRT_DIED;
+                       return FALSE;
+               }
+               rstrm->in_hdrp += n;
+               rstrm->in_hdrlen += n;
+               if (rstrm->in_hdrlen < sizeof (rstrm->in_header)) {
+                       *statp = XPRT_MOREREQS;
+                       return FALSE;
+               }
+               rstrm->in_header = ntohl(rstrm->in_header);
+               fraglen = (int)(rstrm->in_header & ~LAST_FRAG);
+               if (fraglen == 0 || fraglen > rstrm->in_maxrec ||
+                   (rstrm->in_reclen + fraglen) > rstrm->in_maxrec) {
+                       *statp = XPRT_DIED;
+                       return FALSE;
+               }
+               rstrm->in_reclen += fraglen;
+               if (rstrm->in_reclen > rstrm->recvsize)
+                       realloc_stream(rstrm, rstrm->in_reclen);
+               if (rstrm->in_header & LAST_FRAG) {
+                       rstrm->in_header &= ~LAST_FRAG;
+                       rstrm->last_frag = TRUE;
+               }
+       }
+
+       n =  rstrm->readit(rstrm->tcp_handle,
+           rstrm->in_base + rstrm->in_received,
+           (rstrm->in_reclen - rstrm->in_received));
+
+       if (n < 0) {
+               *statp = XPRT_DIED;
+               return FALSE;
+       }
+
+       if (n == 0) {
+               *statp = expectdata ? XPRT_DIED : XPRT_IDLE;
+               return FALSE;
+       }
+
+       rstrm->in_received += n;
+
+       if (rstrm->in_received == rstrm->in_reclen) {
+               rstrm->in_haveheader = FALSE;
+               rstrm->in_hdrp = (char *)(void *)&rstrm->in_header;
+               rstrm->in_hdrlen = 0;
+               if (rstrm->last_frag) {
+                       rstrm->fbtbc = rstrm->in_reclen;
+                       rstrm->in_boundry = rstrm->in_base + rstrm->in_reclen;
+                       rstrm->in_finger = rstrm->in_base;
+                       rstrm->in_reclen = rstrm->in_received = 0;
+                       *statp = XPRT_MOREREQS;
+                       return TRUE;
+               }
+       }
+
+       *statp = XPRT_MOREREQS;
+       return FALSE;
+}
+
+bool_t
+__xdrrec_setnonblock(xdrs, maxrec)
+       XDR *xdrs;
+       int maxrec;
+{
+       RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
+
+       rstrm->nonblock = TRUE;
+       if (maxrec == 0)
+               maxrec = rstrm->recvsize;
+       rstrm->in_maxrec = maxrec;
+       return TRUE;
+}

 
 /*
  * Internal useful routines
  */
 static bool_t
 flush_out(rstrm, eor)
 
 /*
  * Internal useful routines
  */
 static bool_t
 flush_out(rstrm, eor)

-       register RECSTREAM *rstrm;
+       RECSTREAM *rstrm;

        bool_t eor;
 {
        bool_t eor;
 {

-       register u_long eormask = (eor == TRUE) ? LAST_FRAG : 0;
-       register u_long len = (u_long)(rstrm->out_finger) - 
-               (u_long)(rstrm->frag_header) - sizeof(u_long);
+       u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
+       u_int32_t len = rstrm->out_finger - (char *)(rstrm->frag_header) - sizeof(u_int32_t);

 
        *(rstrm->frag_header) = htonl(len | eormask);
 
        *(rstrm->frag_header) = htonl(len | eormask);

-       len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->out_base);
-       if ((*(rstrm->writeit))(rstrm->tcp_handle, rstrm->out_base, (int)len)
-               != (int)len)
+       len = rstrm->out_finger - rstrm->out_base;
+       if ((*(rstrm->writeit))(rstrm->tcp_handle, rstrm->out_base, len) != len)

                return (FALSE);
                return (FALSE);

-       rstrm->frag_header = (u_long *)rstrm->out_base;
-       rstrm->out_finger = (caddr_t)rstrm->out_base + sizeof(u_long);
+       rstrm->frag_header = (u_int32_t *)(void *)rstrm->out_base;
+       rstrm->out_finger = (char *)rstrm->out_base + sizeof(u_int32_t);

        return (TRUE);
 }
 
 static bool_t  /* knows nothing about records!  Only about input buffers */
 fill_input_buf(rstrm)
        return (TRUE);
 }
 
 static bool_t  /* knows nothing about records!  Only about input buffers */
 fill_input_buf(rstrm)

-       register RECSTREAM *rstrm;
+       RECSTREAM *rstrm;

 {
 {

-       register caddr_t where;
-       u_int i;
-       register int len;
+       char *where;
+       u_int32_t i;
+       int len;
+
+       if (rstrm->nonblock)
+               return FALSE;

 
        where = rstrm->in_base;
 
        where = rstrm->in_base;

-       i = (u_int)rstrm->in_boundry % BYTES_PER_XDR_UNIT;
+       i = (size_t)(rstrm->in_boundry) % BYTES_PER_XDR_UNIT;

        where += i;
        len = rstrm->in_size - i;
        if ((len = (*(rstrm->readit))(rstrm->tcp_handle, where, len)) == -1)
        where += i;
        len = rstrm->in_size - i;
        if ((len = (*(rstrm->readit))(rstrm->tcp_handle, where, len)) == -1)


@@ -544,21 +710,29 @@ fill_input_buf(rstrm)
 
 static bool_t  /* knows nothing about records!  Only about input buffers */
 get_input_bytes(rstrm, addr, len)
 
 static bool_t  /* knows nothing about records!  Only about input buffers */
 get_input_bytes(rstrm, addr, len)

-       register RECSTREAM *rstrm;
-       register caddr_t addr;
-       register int len;
+       RECSTREAM *rstrm;
+       char *addr;
+       int len;

 {
 {

-       register int current;
+       size_t current;
+
+       if (rstrm->nonblock) {
+               if (len > (int)(rstrm->in_boundry - rstrm->in_finger))
+                       return FALSE;
+               memcpy(addr, rstrm->in_finger, (size_t)len);
+               rstrm->in_finger += len;
+               return TRUE;
+       }

 
        while (len > 0) {
 
        while (len > 0) {

-               current = (int)rstrm->in_boundry - (int)rstrm->in_finger;
+               current = (size_t)(rstrm->in_boundry - rstrm->in_finger);

                if (current == 0) {
                        if (! fill_input_buf(rstrm))
                                return (FALSE);
                        continue;
                }
                current = (len < current) ? len : current;
                if (current == 0) {
                        if (! fill_input_buf(rstrm))
                                return (FALSE);
                        continue;
                }
                current = (len < current) ? len : current;

-               bcopy(rstrm->in_finger, addr, current);
+               memmove(addr, rstrm->in_finger, current);

                rstrm->in_finger += current;
                addr += current;
                len -= current;
                rstrm->in_finger += current;
                addr += current;
                len -= current;


@@ -568,27 +742,39 @@ get_input_bytes(rstrm, addr, len)
 
 static bool_t  /* next two bytes of the input stream are treated as a header */
 set_input_fragment(rstrm)
 
 static bool_t  /* next two bytes of the input stream are treated as a header */
 set_input_fragment(rstrm)

-       register RECSTREAM *rstrm;
+       RECSTREAM *rstrm;

 {
 {

-       u_long header;
+       u_int32_t header;

 
 

-       if (! get_input_bytes(rstrm, (caddr_t)&header, sizeof(header)))
+       if (rstrm->nonblock)
+               return FALSE;
+       if (! get_input_bytes(rstrm, (char *)(void *)&header, sizeof(header)))

                return (FALSE);
                return (FALSE);

-       header = (long)ntohl(header);
+       header = ntohl(header);

        rstrm->last_frag = ((header & LAST_FRAG) == 0) ? FALSE : TRUE;
        rstrm->last_frag = ((header & LAST_FRAG) == 0) ? FALSE : TRUE;

+       /*
+        * Sanity check. Try not to accept wildly incorrect
+        * record sizes. Unfortunately, the only record size
+        * we can positively identify as being 'wildly incorrect'
+        * is zero. Ridiculously large record sizes may look wrong,
+        * but we don't have any way to be certain that they aren't
+        * what the client actually intended to send us.
+        */
+       if (header == 0)
+               return(FALSE);

        rstrm->fbtbc = header & (~LAST_FRAG);
        return (TRUE);
 }
 
 static bool_t  /* consumes input bytes; knows nothing about records! */
 skip_input_bytes(rstrm, cnt)
        rstrm->fbtbc = header & (~LAST_FRAG);
        return (TRUE);
 }
 
 static bool_t  /* consumes input bytes; knows nothing about records! */
 skip_input_bytes(rstrm, cnt)

-       register RECSTREAM *rstrm;
-       long cnt;
+       RECSTREAM *rstrm;
+       int cnt;

 {
 {

-       register int current;
+       u_int32_t current;

 
        while (cnt > 0) {
 
        while (cnt > 0) {

-               current = (int)rstrm->in_boundry - (int)rstrm->in_finger;
+               current = (size_t)(rstrm->in_boundry - rstrm->in_finger);

                if (current == 0) {
                        if (! fill_input_buf(rstrm))
                                return (FALSE);
                if (current == 0) {
                        if (! fill_input_buf(rstrm))
                                return (FALSE);


@@ -603,10 +789,36 @@ skip_input_bytes(rstrm, cnt)
 
 static u_int
 fix_buf_size(s)
 
 static u_int
 fix_buf_size(s)

-       register u_int s;
+       u_int s;

 {
 
        if (s < 100)
                s = 4000;
        return (RNDUP(s));
 }
 {
 
        if (s < 100)
                s = 4000;
        return (RNDUP(s));
 }

+
+/*
+ * Reallocate the input buffer for a non-block stream.
+ */
+static bool_t
+realloc_stream(rstrm, size)
+       RECSTREAM *rstrm;
+       int size;
+{
+       int diff;
+       char *buf;
+
+       if (size > rstrm->recvsize) {
+               buf = realloc(rstrm->in_base, (size_t)size);
+               if (buf == NULL)
+                       return FALSE;
+               diff = buf - rstrm->in_base;
+               rstrm->in_finger += diff;
+               rstrm->in_base = buf;
+               rstrm->in_boundry = buf + size;
+               rstrm->recvsize = size;
+               rstrm->in_size = size;
+       }
+
+       return TRUE;
+}