summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2015-02-20 23:43:59 +0800
committerMatt Johnston <matt@ucc.asn.au>2015-02-20 23:43:59 +0800
commit2ec56766b8d145ba6d772404da16c73d3e9ba53a (patch)
treebd54c315267f7adc415d30567871fd8a6b116041
parent996be37485de0029912fd91ebcfcfd84ddec46a1 (diff)
downloaddropbear-2ec56766b8d145ba6d772404da16c73d3e9ba53a.tar.gz
avoid some warnings
-rw-r--r--netio.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/netio.c b/netio.c
index b86c85b..43f69d1 100644
--- a/netio.c
+++ b/netio.c
@@ -274,7 +274,7 @@ void connect_set_writequeue(struct dropbear_progress_connection *c, struct Queue
struct iovec * packet_queue_to_iovec(struct Queue *queue, int *ret_iov_count) {
struct iovec *iov = NULL;
struct Link *l;
- unsigned int i, packet_type;
+ unsigned int i;
int len;
buffer *writebuf;
@@ -288,10 +288,9 @@ struct iovec * packet_queue_to_iovec(struct Queue *queue, int *ret_iov_count) {
for (l = queue->head, i = 0; l; l = l->link, i++)
{
writebuf = (buffer*)l->item;
- packet_type = writebuf->data[writebuf->len-1];
len = writebuf->len - 1 - writebuf->pos;
dropbear_assert(len > 0);
- TRACE2(("write_packet writev #%d type %d len %d/%d", i, packet_type,
+ TRACE2(("write_packet writev #%d type %d len %d/%d", i, writebuf->data[writebuf->len-1],
len, writebuf->len-1))
iov[i].iov_base = buf_getptr(writebuf, len);
iov[i].iov_len = len;
@@ -338,7 +337,14 @@ void set_listen_fast_open(int sock) {
void set_sock_priority(int sock, enum dropbear_prio prio) {
- int iptos_val = 0, so_prio_val = 0, rc;
+ int rc;
+#ifdef IPTOS_LOWDELAY
+ int iptos_val = 0;
+#endif
+#ifdef SO_PRIORITY
+ int so_prio_val = 0;
+#endif
+
/* Don't log ENOTSOCK errors so that this can harmlessly be called
* on a client '-J' proxy pipe */