Attachment #1706 for bug #1664

Lines 317-322 channel_new(char *ctype, int type, int rfd, int wfd, int efd, Link Here

(-)a/channels.c (+5 lines)
317	c->output_filter = NULL;	317	c->output_filter = NULL;
318	c->filter_ctx = NULL;	318	c->filter_ctx = NULL;
319	c->filter_cleanup = NULL;	319	c->filter_cleanup = NULL;
		320	c->tag = NULL;
320	TAILQ_INIT(&c->status_confirms);	321	TAILQ_INIT(&c->status_confirms);
321	debug("channel %d: new [%s]", found, remote_name);	322	debug("channel %d: new [%s]", found, remote_name);
322	return c;	323	return c;
Lines 402-407 channel_free(Channel *c) Link Here
402	xfree(c->path);	403	xfree(c->path);
403	c->path = NULL;	404	c->path = NULL;
404	}	405	}
		406	if (c->tag) {
		407	xfree(c->tag);
		408	c->tag = NULL;
		409	}
405	while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) {	410	while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) {
406	if (cc->abandon_cb != NULL)	411	if (cc->abandon_cb != NULL)
407	cc->abandon_cb(c, cc->ctx);	412	cc->abandon_cb(c, cc->ctx);

Lines 137-142 struct Channel { Link Here

(-)a/channels.h (+3 lines)
137		137
138	/* non-blocking connect */	138	/* non-blocking connect */
139	struct channel_connect connect_ctx;	139	struct channel_connect connect_ctx;
		140
		141	/* friendly name */
		142	char *tag;
140	};	143	};
141		144
142	#define CHAN_EXTENDED_IGNORE 0	145	#define CHAN_EXTENDED_IGNORE 0

Lines 1157-1162 ssh_session2_open(void) Link Here

(-)a/ssh.c (+1 lines)
1157	"session", SSH_CHANNEL_OPENING, in, out, err,	1157	"session", SSH_CHANNEL_OPENING, in, out, err,
1158	window, packetmax, CHAN_EXTENDED_WRITE,	1158	window, packetmax, CHAN_EXTENDED_WRITE,
1159	"client-session", /nonblock/0);	1159	"client-session", /nonblock/0);
		1160	xasprintf(&c->tag, "%ld", (long)getpid());
1160		1161
1161	debug3("ssh_session2_open: channel_new: %d", c->self);	1162	debug3("ssh_session2_open: channel_new: %d", c->self);
1162		1163

Return to bug 1664