From 7f1591054198e6633f7ed2b1f79d8ed0826df21b Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Sun, 4 Mar 2018 14:57:18 +0800 Subject: get rid of unused packet_type in encrypted write queue --- netio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'netio.c') diff --git a/netio.c b/netio.c index 62fdc72..3cd7b5e 100644 --- a/netio.c +++ b/netio.c @@ -306,10 +306,10 @@ void packet_queue_to_iovec(const struct Queue *queue, struct iovec *iov, unsigne for (l = queue->head, i = 0; i < *iov_count; l = l->link, i++) { writebuf = (buffer*)l->item; - len = writebuf->len - 1 - writebuf->pos; + len = writebuf->len - writebuf->pos; dropbear_assert(len > 0); - TRACE2(("write_packet writev #%d type %d len %d/%d", i, writebuf->data[writebuf->len-1], - len, writebuf->len-1)) + TRACE2(("write_packet writev #%d len %d/%d", i, + len, writebuf->len)) iov[i].iov_base = buf_getptr(writebuf, len); iov[i].iov_len = len; } @@ -320,7 +320,7 @@ void packet_queue_consume(struct Queue *queue, ssize_t written) { int len; while (written > 0) { writebuf = (buffer*)examine(queue); - len = writebuf->len - 1 - writebuf->pos; + len = writebuf->len - writebuf->pos; if (len > written) { /* partial buffer write */ buf_incrpos(writebuf, written); -- cgit v1.2.3 From ffde4a524f3a595c476fc1bf9f6a8e2bcf98ed63 Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Wed, 14 Nov 2018 22:52:04 +0800 Subject: Remove some cluttering TRACE printouts --- netio.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'netio.c') diff --git a/netio.c b/netio.c index 3cd7b5e..87e7fb4 100644 --- a/netio.c +++ b/netio.c @@ -224,7 +224,6 @@ void remove_connect_pending() { void set_connect_fds(fd_set *writefd) { m_list_elem *iter; - TRACE(("enter set_connect_fds")) iter = ses.conn_pending.first; while (iter) { m_list_elem *next_iter = iter->next; @@ -245,12 +244,10 @@ void set_connect_fds(fd_set *writefd) { } iter = next_iter; } - TRACE(("leave set_connect_fds")) } void handle_connect_fds(const fd_set *writefd) { m_list_elem *iter; - TRACE(("enter handle_connect_fds")) for (iter = ses.conn_pending.first; iter; iter = iter->next) { int val; socklen_t vallen = sizeof(val); @@ -284,7 +281,6 @@ void handle_connect_fds(const fd_set *writefd) { return; } } - TRACE(("leave handle_connect_fds - end iter")) } void connect_set_writequeue(struct dropbear_progress_connection *c, struct Queue *writequeue) { -- cgit v1.2.3 From 16fb0b0d5369ccf0557d224c70a87e4a65f59a80 Mon Sep 17 00:00:00 2001 From: karel-m <1918753+karel-m@users.noreply.github.com> Date: Wed, 20 Mar 2019 16:05:37 +0100 Subject: cygwin competibility fix (#64) --- netio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'netio.c') diff --git a/netio.c b/netio.c index 87e7fb4..8452003 100644 --- a/netio.c +++ b/netio.c @@ -294,7 +294,11 @@ void packet_queue_to_iovec(const struct Queue *queue, struct iovec *iov, unsigne buffer *writebuf; #ifndef IOV_MAX - #define IOV_MAX UIO_MAXIOV + #if defined(__CYGWIN__) && !defined(UIO_MAXIOV) + #define IOV_MAX 1024 + #else + #define IOV_MAX UIO_MAXIOV + #endif #endif *iov_count = MIN(MIN(queue->count, IOV_MAX), *iov_count); -- cgit v1.2.3 From 4faf06aae794a5b720fd3653ae2870e639a264fd Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Thu, 28 May 2020 23:26:34 +0800 Subject: Don't warn when SO_PRIORITY fails --- netio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'netio.c') diff --git a/netio.c b/netio.c index 8452003..d84975a 100644 --- a/netio.c +++ b/netio.c @@ -398,9 +398,9 @@ void set_sock_priority(int sock, enum dropbear_prio prio) { } /* linux specific, sets QoS class. see tc-prio(8) */ rc = setsockopt(sock, SOL_SOCKET, SO_PRIORITY, (void*) &so_prio_val, sizeof(so_prio_val)); - if (rc < 0 && errno != ENOTSOCK) - dropbear_log(LOG_WARNING, "Couldn't set SO_PRIORITY (%s)", - strerror(errno)); + if (rc < 0 && errno != ENOTSOCK) { + TRACE(("Couldn't set SO_PRIORITY (%s)", strerror(errno))) + } #endif } -- cgit v1.2.3 From ec993dbdbcc8b3f91ef96de86c25a2e3b62c7d04 Mon Sep 17 00:00:00 2001 From: Kazuo Kuroi Date: Wed, 10 Jun 2020 22:09:29 +0800 Subject: Set IOV_MAX for IRIX --- netio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'netio.c') diff --git a/netio.c b/netio.c index d84975a..3988433 100644 --- a/netio.c +++ b/netio.c @@ -293,13 +293,15 @@ void packet_queue_to_iovec(const struct Queue *queue, struct iovec *iov, unsigne int len; buffer *writebuf; - #ifndef IOV_MAX - #if defined(__CYGWIN__) && !defined(UIO_MAXIOV) +#ifndef IOV_MAX + #if defined(__CYGWIN__) && !defined(UIO_MAXIOV) #define IOV_MAX 1024 - #else + #elif defined(__sgi) + #define IOV_MAX 512 + #else #define IOV_MAX UIO_MAXIOV - #endif #endif +#endif *iov_count = MIN(MIN(queue->count, IOV_MAX), *iov_count); -- cgit v1.2.3