d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix amd(8) clients, if a FreeBSD mountd(8) server is used.

Browse Source 
Remove the special treatment of non-blocking mode in
the "look ahead function" xdrrec_eof(). It currently
assumes that the last read() in a row of several reads
does not have zero lenght. If this is the case, svc_vc_stat()
does return XPRT_MOREREQS, and the RPC-request aborts because
there is no data to read anymore.

To fix this, go back to the original version of the code
for non-blocking mode until NetBSD comes up with another
possible fix like this one in xdrrec_eof()

	if (rstrm->last_frag && rstrm->in_finger == rstrm->in_boundry) {
		return TRUE;
	}

Return always FALSE in set_input_fragment() for non-blocking
mode. Since this was not used in FreeBSD, I omitted it at the
first time. Now we use this function and we should always
return FALSE for it.

Reviewed by:	rwatson
Approved by:	re
This commit is contained in:
Martin Blapp 2003-05-28 09:13:09 +00:00
parent f4203da86c
commit 22e4d31a81
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=115363
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libc/xdr/xdr_rec.c
View File

@ -489,15 +489,6 @@ xdrrec_eof(xdrs)
XDR *xdrs;
{
RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
enum xprt_stat xstat;
if (rstrm->nonblock) {
if (__xdrrec_getrec(xdrs, &xstat, FALSE))
return FALSE;
if (!rstrm->in_haveheader && xstat == XPRT_IDLE)
return TRUE;
return FALSE;
}
while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
if (! skip_input_bytes(rstrm, rstrm->fbtbc))
@ -719,6 +710,8 @@ set_input_fragment(rstrm)
{
u_int32_t header;
if (rstrm->nonblock)
return FALSE;
if (! get_input_bytes(rstrm, (char *)(void *)&header, sizeof(header)))
return (FALSE);
header = ntohl(header);