Attachment #1260 for bug #1306




	} else if (ret == -1) {
		logit("X11 connection rejected because of wrong authentication.");
		debug2("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate);
		chan_read_failed(c, 0);
		buffer_clear(&c->input);
		chan_ibuf_empty(c);
		buffer_clear(&c->output);

channel_handle_rfd(Channel *c, fd_set *readset, fd_set *writeset)
{
	char buf[CHAN_RBUF];
	int len, save_errno;

	if (c->rfd != -1 &&
	    (c->detach_close || FD_ISSET(c->rfd, readset))) {
		errno = 0;
		len = read(c->rfd, buf, sizeof(buf));
		save_errno = errno;
		if (len < 0 && (errno == EINTR ||
		    (errno == EAGAIN && !(c->isatty && c->detach_close))))
			return 1;

				c->type = SSH_CHANNEL_INPUT_DRAINING;
				debug2("channel %d: input draining.", c->self);
			} else {
				chan_read_failed(c, save_errno);
			}
			return -1;
		}
		if (c->input_filter != NULL) {
			if (c->input_filter(c, buf, len) == -1) {
				debug2("channel %d: filter stops", c->self);
				chan_read_failed(c, 0);
			}
		} else if (c->datagram) {
			buffer_put_string(&c->input, buf, len);

				chan_mark_dead(c);
				return -1;
			} else {
				chan_read_failed(c, 0);
				chan_write_failed(c);
			}
			return -1;

Lines 240-246 void chan_mark_dead(Channel *); Link Here

(-)channels.h (-1 / +1 lines)
240	/* channel events */	240	/* channel events */
241		241
242	void chan_rcvd_oclose(Channel *);	242	void chan_rcvd_oclose(Channel *);
243	void chan_read_failed(Channel *);	243	void chan_read_failed(Channel *, int);
244	void chan_ibuf_empty(Channel *);	244	void chan_ibuf_empty(Channel *);
245		245
246	void chan_rcvd_ieof(Channel *);	246	void chan_rcvd_ieof(Channel *);




	}
}
void
chan_read_failed(Channel *c, int err_no)
{
	debug2("channel %d: read failed%s, istate %d", c->self,
	    err_no ? "" : " (simulated)", c->istate);
	switch (c->istate) {
	case CHAN_INPUT_OPEN:
		chan_shutdown_read(c);
		chan_set_istate(c, CHAN_INPUT_WAIT_DRAIN);
		break;
	default:
		if (err_no != 0)
			error("channel %d: chan_read_failed for istate %d: %s",
			    c->self, c->istate, strerror(errno));
		break;
	}
}

Return to bug 1306

Lines 932-938 channel_pre_x11_open(Channel *c, fd_set Link Here

(-)channels.c (-5 / +6 lines)
932	} else if (ret == -1) {	932	} else if (ret == -1) {
933	logit("X11 connection rejected because of wrong authentication.");	933	logit("X11 connection rejected because of wrong authentication.");
934	debug2("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate);	934	debug2("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate);
935	chan_read_failed(c);	935	chan_read_failed(c, 0);
936	buffer_clear(&c->input);	936	buffer_clear(&c->input);
937	chan_ibuf_empty(c);	937	chan_ibuf_empty(c);
938	buffer_clear(&c->output);	938	buffer_clear(&c->output);
Lines 1446-1457 static int Link Here
1446	channel_handle_rfd(Channel c, fd_set readset, fd_set *writeset)	1446	channel_handle_rfd(Channel c, fd_set readset, fd_set *writeset)
1447	{	1447	{
1448	char buf[CHAN_RBUF];	1448	char buf[CHAN_RBUF];
1449	int len;	1449	int len, save_errno;
1450		1450
1451	if (c->rfd != -1 &&	1451	if (c->rfd != -1 &&
1452	(c->detach_close \|\| FD_ISSET(c->rfd, readset))) {	1452	(c->detach_close \|\| FD_ISSET(c->rfd, readset))) {
1453	errno = 0;	1453	errno = 0;
1454	len = read(c->rfd, buf, sizeof(buf));	1454	len = read(c->rfd, buf, sizeof(buf));
		1455	save_errno = errno;
1455	if (len < 0 && (errno == EINTR \|\|	1456	if (len < 0 && (errno == EINTR \|\|
1456	(errno == EAGAIN && !(c->isatty && c->detach_close))))	1457	(errno == EAGAIN && !(c->isatty && c->detach_close))))
1457	return 1;	1458	return 1;
Lines 1472-1485 channel_handle_rfd(Channel c, fd_set r Link Here
1472	c->type = SSH_CHANNEL_INPUT_DRAINING;	1473	c->type = SSH_CHANNEL_INPUT_DRAINING;
1473	debug2("channel %d: input draining.", c->self);	1474	debug2("channel %d: input draining.", c->self);
1474	} else {	1475	} else {
1475	chan_read_failed(c);	1476	chan_read_failed(c, save_errno);
1476	}	1477	}
1477	return -1;	1478	return -1;
1478	}	1479	}
1479	if (c->input_filter != NULL) {	1480	if (c->input_filter != NULL) {
1480	if (c->input_filter(c, buf, len) == -1) {	1481	if (c->input_filter(c, buf, len) == -1) {
1481	debug2("channel %d: filter stops", c->self);	1482	debug2("channel %d: filter stops", c->self);
1482	chan_read_failed(c);	1483	chan_read_failed(c, 0);
1483	}	1484	}
1484	} else if (c->datagram) {	1485	} else if (c->datagram) {
1485	buffer_put_string(&c->input, buf, len);	1486	buffer_put_string(&c->input, buf, len);
Lines 1643-1649 channel_handle_ctl(Channel c, fd_set r Link Here
1643	chan_mark_dead(c);	1644	chan_mark_dead(c);
1644	return -1;	1645	return -1;
1645	} else {	1646	} else {
1646	chan_read_failed(c);	1647	chan_read_failed(c, 0);
1647	chan_write_failed(c);	1648	chan_write_failed(c);
1648	}	1649	}
1649	return -1;	1650	return -1;

Lines 133-149 chan_rcvd_oclose1(Channel *c) Link Here

(-)nchan.c (-4 / +6 lines)
133	}	133	}
134	}	134	}
135	void	135	void
136	chan_read_failed(Channel *c)	136	chan_read_failed(Channel *c, int err_no)
137	{	137	{
138	debug2("channel %d: read failed", c->self);	138	debug2("channel %d: read failed%s, istate %d", c->self,
		139	err_no ? "" : " (simulated)", c->istate);
139	switch (c->istate) {	140	switch (c->istate) {
140	case CHAN_INPUT_OPEN:	141	case CHAN_INPUT_OPEN:
141	chan_shutdown_read(c);	142	chan_shutdown_read(c);
142	chan_set_istate(c, CHAN_INPUT_WAIT_DRAIN);	143	chan_set_istate(c, CHAN_INPUT_WAIT_DRAIN);
143	break;	144	break;
144	default:	145	default:
145	error("channel %d: chan_read_failed for istate %d",	146	if (err_no != 0)
146	c->self, c->istate);	147	error("channel %d: chan_read_failed for istate %d: %s",
		148	c->self, c->istate, strerror(errno));
147	break;	149	break;
148	}	150	}
149	}	151	}