The unified diff between revisions [fdd44441..] and [1d86a4f0..] 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 [2616df4031a05a3fea394b765fd1004944677ef5]
#    to [2efb08417ba19492fb560c445117e1b1f7c10ae1]
#
============================================================
--- channel.h	2616df4031a05a3fea394b765fd1004944677ef5
+++ channel.h	2efb08417ba19492fb560c445117e1b1f7c10ae1
@@ -81,6 +81,10 @@ struct Channel {
 	int initconn; /* used for TCP forwarding, whether the channel has been
 					 fully initialised */

+	int await_open; /* flag indicating whether we've sent an open request
+					   for this channel (and are awaiting a confirmation
+					   or failure). */
+
 	const struct ChanType* type;

 };
@@ -96,7 +100,7 @@ struct ChanType {

 };

-void chaninitialise();
+void chaninitialise(const struct ChanType *chantypes[]);
 void chancleanup();
 void setchannelfds(fd_set *readfd, fd_set *writefd);
 void channelio(fd_set *readfd, fd_set *writefd);
@@ -119,7 +123,7 @@ void common_recv_msg_channel_data(struct
 		circbuffer * buf);

 #ifdef DROPBEAR_CLIENT
-const struct ChanType clichansess;
+extern const struct ChanType clichansess;
 #endif

 #if defined(USING_LISTENERS) || defined(DROPBEAR_CLIENT)