The unified diff between revisions [6cb77934..] and [fc57c894..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'channel.h'

#
#
# patch "channel.h"
#  from [b72f20eddf4824bdd1280ee7dbe855301813610c]
#    to [aa5deb13fb94e010f897c9e4ac68862a81c26e57]
#
============================================================
--- channel.h	b72f20eddf4824bdd1280ee7dbe855301813610c
+++ channel.h	aa5deb13fb94e010f897c9e4ac68862a81c26e57
@@ -73,11 +73,10 @@ struct Channel {
 	circbuffer *extrabuf; /* extended-data for the program - used like writebuf
 					     but for stderr */

-	int sentclosed, recvclosed;
+	/* whether close/eof messages have been exchanged */
+	int sent_close, recv_close;
+	int recv_eof, sent_eof;

-	/* this is set when we receive/send a channel eof packet */
-	int recveof, senteof;
-
 	int initconn; /* used for TCP forwarding, whether the channel has been
 					 fully initialised */

@@ -85,6 +84,8 @@ struct Channel {
 					   for this channel (and are awaiting a confirmation
 					   or failure). */

+	int flushing;
+
 	const struct ChanType* type;

 };
@@ -94,7 +95,7 @@ struct ChanType {
 	int sepfds; /* Whether this channel has seperate pipes for in/out or not */
 	char *name;
 	int (*inithandler)(struct Channel*);
-	int (*checkclose)(struct Channel*);
+	int (*check_close)(struct Channel*);
 	void (*reqhandler)(struct Channel*);
 	void (*closehandler)(struct Channel*);