Differences From Artifact [f7e9b8d187]:

• File x11fwd.c — part of check-in [e84a3c910c] at 2001-08-25 12:09:23 on branch trunk — Extensive changes that _should_ fix the socket buffering problems, by ceasing to listen on input channels if the corresponding output channel isn't accepting data. Has had basic check-I-didn't-actually- break-anything-too-badly testing, but hasn't been genuinely tested in stress conditions (because concocting stress conditions is non- trivial). (user: simon size: 8812)

To Artifact [af48e2df0d]:

• File x11fwd.c — part of check-in [b37b4aae64] at 2001-08-28 07:24:50 on branch trunk — Semantic fix in the X11 `authentication failed' error packet construction. Doesn't actually affect anything right now, since the bug was a failure to round a length up to the next multiple of 4 and it so happens that our current message was exactly 40 bytes anyway :-) But if we start giving a wider variety of messages one day then it might be handy to be able to do them without gratuitous crashes. (user: simon size: 8812)

304
305
306
307
308
309
310
311

312
313
314
315
316
317
318

304
305
306
307
308
309
310

311
312
313
314
315
316
317
318

-
+

	    char message[] = "Authentication failed at PuTTY X11 proxy";
	    unsigned char reply[8 + sizeof(message) + 4];
	    int msglen = sizeof(message) - 1;	/* skip zero byte */
	    int msgsize = (msglen + 3) & ~3;
	    reply[0] = 0;	       /* failure */
	    reply[1] = msglen;	       /* length of reason string */
	    memcpy(reply + 2, pr->firstpkt + 2, 4);	/* major/minor proto vsn */
	    PUT_16BIT(pr->firstpkt[0], reply + 6, msglen >> 2);	/* data len */
	    PUT_16BIT(pr->firstpkt[0], reply + 6, msgsize >> 2);/* data len */
	    memset(reply + 8, 0, msgsize);
	    memcpy(reply + 8, message, msglen);
	    sshfwd_write(pr->c, reply, 8 + msgsize);
	    sshfwd_close(pr->c);
	    x11_close(s);
	    return 0;
	}