ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-06-26 18:17:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* ensure that we only handle open confirmation/failure

Browse Source 
for channels where it is expected

--HG--
extra : convert_revision : acc1ba014aae08ecb3159282fe87defe67899a40
This commit is contained in:
Matt Johnston 2005-09-05 17:10:32 +00:00
parent 70438b7715
commit 18b082955b
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channel.h
View File

@ -81,6 +81,10 @@ struct Channel {
int initconn; /* used for TCP forwarding, whether the channel has been int initconn; /* used for TCP forwarding, whether the channel has been
fully initialised */ 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; const struct ChanType* type;
}; };

13
common-channel.c
View File

@ -147,6 +147,7 @@ struct Channel* newchannel(unsigned int remotechan,
newchan->outfd = FD_UNINIT; newchan->outfd = FD_UNINIT;
newchan->errfd = FD_CLOSED; /* this isn't always set to start with */ newchan->errfd = FD_CLOSED; /* this isn't always set to start with */
newchan->initconn = 0; newchan->initconn = 0;
newchan->await_open = 0;
newchan->writebuf = cbuf_new(RECV_MAXWINDOW); newchan->writebuf = cbuf_new(RECV_MAXWINDOW);
newchan->extrabuf = NULL; /* The user code can set it up */ newchan->extrabuf = NULL; /* The user code can set it up */
@ -933,6 +934,8 @@ int send_msg_channel_open_init(int fd, const struct ChanType *type) {
chan->infd = chan->outfd = fd; chan->infd = chan->outfd = fd;
ses.maxfd = MAX(ses.maxfd, fd); ses.maxfd = MAX(ses.maxfd, fd);
chan->await_open = 1;
/* now open the channel connection */ /* now open the channel connection */
CHECKCLEARTOWRITE(); CHECKCLEARTOWRITE();
@ -960,6 +963,11 @@ void recv_msg_channel_open_confirmation() {
dropbear_exit("Unknown channel"); dropbear_exit("Unknown channel");
} }
if (!channel->await_open) {
dropbear_exit("unexpected channel reply");
}
channel->await_open = 0;
channel->remotechan = buf_getint(ses.payload); channel->remotechan = buf_getint(ses.payload);
channel->transwindow = buf_getint(ses.payload); channel->transwindow = buf_getint(ses.payload);
channel->transmaxpacket = buf_getint(ses.payload); channel->transmaxpacket = buf_getint(ses.payload);
@ -990,6 +998,11 @@ void recv_msg_channel_open_failure() {
dropbear_exit("Unknown channel"); dropbear_exit("Unknown channel");
} }
if (!channel->await_open) {
dropbear_exit("unexpected channel reply");
}
channel->await_open = 0;
removechannel(channel); removechannel(channel);
} }
#endif /* USING_LISTENERS */ #endif /* USING_LISTENERS */