Mercurial > dropbear

diff common-channel.c @ 6:ab00ef513e97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sorted out the first channel init issues.
author Matt Johnston <matt@ucc.asn.au>
date Tue, 01 Jun 2004 10:48:46 +0000
parents fe6bca95afa7
children 425ed5c20157
line wrap: on
line diff
--- a/common-channel.c	Tue Jun 01 04:20:12 2004 +0000
+++ b/common-channel.c	Tue Jun 01 10:48:46 2004 +0000
@@ -61,7 +61,7 @@
 #define FD_CLOSED (-1)
 
 /* Initialise all the channels */
-void chaninitialise(struct ChanType *chantypes[]) {
+void chaninitialise(const struct ChanType *chantypes[]) {
 
 	/* may as well create space for a single channel */
 	ses.channels = (struct Channel**)m_malloc(sizeof(struct Channel*));
@@ -737,7 +737,7 @@
 	unsigned int typelen;
 	unsigned int remotechan, transwindow, transmaxpacket;
 	struct Channel *channel;
-	struct ChanType *chantype;
+	const struct ChanType *chantype;
 	unsigned int errtype = SSH_OPEN_UNKNOWN_CHANNEL_TYPE;
 	int ret;
 
@@ -775,14 +775,16 @@
 	channel = newchannel(remotechan, chantype, transwindow, transmaxpacket);
 
 	if (channel == NULL) {
+		TRACE(("newchannel returned NULL"));
 		goto failure;
 	}
 
 	if (channel->type->inithandler) {
 		ret = channel->type->inithandler(channel);
-		if (ret >= 0) {
+		if (ret > 0) {
 			errtype = ret;
 			deletechannel(channel);
+			TRACE(("inithandler returned failure %d", ret));
 			goto failure;
 		}
 	}
@@ -810,6 +812,7 @@
 	goto cleanup;
 
 failure:
+	TRACE(("recv_msg_channel_open failure"));
 	send_msg_channel_open_failure(remotechan, errtype, "", "");
 
 cleanup: