ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 10:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid malloc for iovec

Browse Source
This commit is contained in:
Matt Johnston 2015-03-20 22:53:32 +08:00
parent dce384668b
commit 20f9683ae0
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common-channel.c
View File

@ -482,7 +482,7 @@ static void writechannel(struct Channel* channel, int fd, circbuffer *cbuf,
if (written < 0) {
if (errno != EINTR && errno != EAGAIN) {
TRACE(("errno %d len %d", errno, len))
TRACE(("errno %d", errno))
close_chan_fd(channel, fd, SHUT_WR);
}
} else {

17
netio.c
View File

@ -72,6 +72,7 @@ static void connect_try_next(struct dropbear_progress_connection *c) {
int fastopen = 0;
#ifdef DROPBEAR_TCP_FAST_OPEN
struct msghdr message;
struct iovec message;
#endif
for (r = c->res_iter; r; r = r->ai_next)
@ -99,8 +100,11 @@ static void connect_try_next(struct dropbear_progress_connection *c) {
message.msg_namelen = r->ai_addrlen;
if (c->writequeue) {
int iovlen; /* Linux msg_iovlen is a size_t */
message.msg_iov = packet_queue_to_iovec(c->writequeue, &iovlen);
/* 6 is arbitrary, enough to hold initial packets */
int iovlen = 6; /* Linux msg_iovlen is a size_t */
struct iov[6];
packet_queue_to_iovec(c->writequeue, iov, &iovlen);
message.msg_iov = &iov;
message.msg_iovlen = iovlen;
res = sendmsg(c->sock, &message, MSG_FASTOPEN);
if (res < 0 && errno != EINPROGRESS) {
@ -114,7 +118,6 @@ static void connect_try_next(struct dropbear_progress_connection *c) {
/* Set to NULL to avoid trying again */
c->writequeue = NULL;
}
m_free(message.msg_iov);
packet_queue_consume(c->writequeue, res);
}
#endif
@ -258,8 +261,7 @@ void connect_set_writequeue(struct dropbear_progress_connection *c, struct Queue
c->writequeue = writequeue;
}
struct iovec * packet_queue_to_iovec(struct Queue *queue, int *ret_iov_count) {
struct iovec *iov = NULL;
void packet_queue_to_iovec(struct Queue *queue, struct iovec *iov, unsigned int *iov_count) {
struct Link *l;
unsigned int i;
int len;
@ -269,9 +271,8 @@ struct iovec * packet_queue_to_iovec(struct Queue *queue, int *ret_iov_count) {
#define IOV_MAX UIO_MAXIOV
#endif
*ret_iov_count = MIN(queue->count, IOV_MAX);
*iov_count = MIN(MIN(queue->count, IOV_MAX), *iov_count);
iov = m_malloc(sizeof(*iov) * *ret_iov_count);
for (l = queue->head, i = 0; l; l = l->link, i++)
{
writebuf = (buffer*)l->item;
@ -282,8 +283,6 @@ struct iovec * packet_queue_to_iovec(struct Queue *queue, int *ret_iov_count) {
iov[i].iov_base = buf_getptr(writebuf, len);
iov[i].iov_len = len;
}
return iov;
}
void packet_queue_consume(struct Queue *queue, ssize_t written) {

3
netio.h
View File

@ -44,7 +44,8 @@ void cancel_connect(struct dropbear_progress_connection *c);
void connect_set_writequeue(struct dropbear_progress_connection *c, struct Queue *writequeue);
/* TODO: writev #ifdef guard */
struct iovec * packet_queue_to_iovec(struct Queue *queue, int *ret_iov_count);
/* Fills out iov which contains iov_count slots, returning the number filled in iov_count */
void packet_queue_to_iovec(struct Queue *queue, struct iovec *iov, unsigned int *iov_count);
void packet_queue_consume(struct Queue *queue, ssize_t written);
#ifdef DROPBEAR_TCP_FAST_OPEN

9
packet.c
View File

@ -58,8 +58,9 @@ void write_packet() {
ssize_t written;
#ifdef HAVE_WRITEV
struct iovec *iov = NULL;
int iov_count;
/* 50 is somewhat arbitrary */
int iov_count = 50;
struct iovec iov[50];
#endif
TRACE2(("enter write_packet"))
@ -67,7 +68,7 @@ void write_packet() {
#if defined(HAVE_WRITEV) && (defined(IOV_MAX) || defined(UIO_MAXIOV))
iov = packet_queue_to_iovec(&ses.writequeue, &iov_count);
packet_queue_to_iovec(&ses.writequeue, iov, &iov_count);
/* This may return EAGAIN. The main loop sometimes
calls write_packet() without bothering to test with select() since
it's likely to be necessary */
@ -75,13 +76,11 @@ void write_packet() {
if (written < 0) {
if (errno == EINTR || errno == EAGAIN) {
TRACE2(("leave write_packet: EINTR"))
m_free(iov);
return;
} else {
dropbear_exit("Error writing: %s", strerror(errno));
}
}
m_free(iov);
packet_queue_consume(&ses.writequeue, written);