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

use an empty writebuf rather than a NULL one

Browse Source
This commit is contained in:
Matt Johnston 2013-03-20 22:31:07 +08:00
parent f7b1222073
commit 804a1e69f2
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
circbuffer.c
View File

@ -37,7 +37,9 @@ circbuffer * cbuf_new(unsigned int size) {
} }
cbuf = (circbuffer*)m_malloc(sizeof(circbuffer)); cbuf = (circbuffer*)m_malloc(sizeof(circbuffer));
cbuf->data = (unsigned char*)m_malloc(size); if (size > 0) {
cbuf->data = (unsigned char*)m_malloc(size);
}
cbuf->used = 0; cbuf->used = 0;
cbuf->readpos = 0; cbuf->readpos = 0;
cbuf->writepos = 0; cbuf->writepos = 0;

19
common-channel.c
View File

@ -95,7 +95,8 @@ void chancleanup() {
static void static void
chan_initwritebuf(struct Channel *channel) chan_initwritebuf(struct Channel *channel)
{ {
dropbear_assert(channel->writebuf == NULL && channel->recvwindow == 0); dropbear_assert(channel->writebuf->size == 0 && channel->recvwindow == 0);
cbuf_free(channel->writebuf);
channel->writebuf = cbuf_new(opts.recv_window); channel->writebuf = cbuf_new(opts.recv_window);
channel->recvwindow = opts.recv_window; channel->recvwindow = opts.recv_window;
} }
@ -159,7 +160,7 @@ static struct Channel* newchannel(unsigned int remotechan,
newchan->await_open = 0; newchan->await_open = 0;
newchan->flushing = 0; newchan->flushing = 0;
newchan->writebuf = NULL; newchan->writebuf = cbuf_new(0); /* resized later by chan_initwritebuf */
newchan->recvwindow = 0; newchan->recvwindow = 0;
newchan->extrabuf = NULL; /* The user code can set it up */ newchan->extrabuf = NULL; /* The user code can set it up */
@ -233,7 +234,6 @@ void channelio(fd_set *readfds, fd_set *writefds) {
continue; /* Important not to use the channel after continue; /* Important not to use the channel after
check_in_progress(), as it may be NULL */ check_in_progress(), as it may be NULL */
} }
dropbear_assert(channel->writebuf);
writechannel(channel, channel->writefd, channel->writebuf); writechannel(channel, channel->writefd, channel->writebuf);
} }
@ -259,9 +259,7 @@ void channelio(fd_set *readfds, fd_set *writefds) {
* stderr of a channel's endpoint. */ * stderr of a channel's endpoint. */
static unsigned int write_pending(struct Channel * channel) { static unsigned int write_pending(struct Channel * channel) {
if (channel->writefd >= 0 if (channel->writefd >= 0 && cbuf_getused(channel->writebuf) > 0) {
&& channel->writebuf
&& cbuf_getused(channel->writebuf) > 0) {
return 1; return 1;
} else if (channel->errfd >= 0 && channel->extrabuf && } else if (channel->errfd >= 0 && channel->extrabuf &&
cbuf_getused(channel->extrabuf) > 0) { cbuf_getused(channel->extrabuf) > 0) {
@ -452,8 +450,7 @@ static void writechannel(struct Channel* channel, int fd, circbuffer *cbuf) {
} }
dropbear_assert(channel->recvwindow <= opts.recv_window); dropbear_assert(channel->recvwindow <= opts.recv_window);
dropbear_assert(channel->writebuf == NULL || dropbear_assert(channel->recvwindow <= cbuf_getavail(channel->writebuf));
channel->recvwindow <= cbuf_getavail(channel->writebuf));
dropbear_assert(channel->extrabuf == NULL || dropbear_assert(channel->extrabuf == NULL ||
channel->recvwindow <= cbuf_getavail(channel->extrabuf)); channel->recvwindow <= cbuf_getavail(channel->extrabuf));
@ -546,10 +543,8 @@ static void remove_channel(struct Channel * channel) {
TRACE(("enter remove_channel")) TRACE(("enter remove_channel"))
TRACE(("channel index is %d", channel->index)) TRACE(("channel index is %d", channel->index))
if (channel->writebuf) { cbuf_free(channel->writebuf);
cbuf_free(channel->writebuf); channel->writebuf = NULL;
channel->writebuf = NULL;
}
if (channel->extrabuf) { if (channel->extrabuf) {
cbuf_free(channel->extrabuf); cbuf_free(channel->extrabuf);