Reset in_reclen and in_received after having received a full record in

the nonblocking case.
This commit is contained in:
fvdl 2003-01-27 20:56:45 +00:00
parent c316063660
commit 161423ddca
1 changed files with 4 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: xdr_rec.c,v 1.20 2003/01/18 11:29:07 thorpej Exp $ */ /* $NetBSD: xdr_rec.c,v 1.21 2003/01/27 20:56:45 fvdl Exp $ */
/* /*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@ -35,7 +35,7 @@
static char *sccsid = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro"; 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"; static char *sccsid = "@(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC";
#else #else
__RCSID("$NetBSD: xdr_rec.c,v 1.20 2003/01/18 11:29:07 thorpej Exp $"); __RCSID("$NetBSD: xdr_rec.c,v 1.21 2003/01/27 20:56:45 fvdl Exp $");
#endif #endif
#endif #endif
@ -621,6 +621,7 @@ __xdrrec_getrec(xdrs, statp, expectdata)
rstrm->fbtbc = rstrm->in_reclen; rstrm->fbtbc = rstrm->in_reclen;
rstrm->in_boundry = rstrm->in_base + rstrm->in_reclen; rstrm->in_boundry = rstrm->in_base + rstrm->in_reclen;
rstrm->in_finger = rstrm->in_base; rstrm->in_finger = rstrm->in_base;
rstrm->in_reclen = rstrm->in_received = 0;
*statp = XPRT_MOREREQS; *statp = XPRT_MOREREQS;
return TRUE; return TRUE;
} }
@ -699,7 +700,7 @@ get_input_bytes(rstrm, addr, len)
size_t current; size_t current;
if (rstrm->nonblock) { if (rstrm->nonblock) {
if (len > rstrm->in_reclen) if (len > (int)(rstrm->in_boundry - rstrm->in_finger))
return FALSE; return FALSE;
memcpy(addr, rstrm->in_finger, (size_t)len); memcpy(addr, rstrm->in_finger, (size_t)len);
rstrm->in_finger += len; rstrm->in_finger += len;