diff --git a/src/local.h b/src/local.h
index c257d2ca..7ac4cac4 100644
--- a/src/local.h
+++ b/src/local.h
@@ -52,7 +52,7 @@ struct server
 {
     int fd;
     ssize_t buf_len;
-    int buf_idx;
+    ssize_t buf_idx;
     char *buf; // server send from, remote recv into
     int addr_len;
     char *addr_to_send;
@@ -77,7 +77,7 @@ struct remote
 {
     int fd;
     ssize_t buf_len;
-    int buf_idx;
+    ssize_t buf_idx;
     int direct;
     char *buf; // remote send from, server recv into
     struct remote_ctx *recv_ctx;
diff --git a/src/redir.h b/src/redir.h
index cd2efaa8..ea0141c9 100644
--- a/src/redir.h
+++ b/src/redir.h
@@ -49,7 +49,7 @@ struct server
 {
     int fd;
     ssize_t buf_len;
-    int buf_idx;
+    ssize_t buf_idx;
     char *buf; // server send from, remote recv into
     struct sockaddr_in destaddr;
     struct enc_ctx *e_ctx;
@@ -71,7 +71,7 @@ struct remote
 {
     int fd;
     ssize_t buf_len;
-    int buf_idx;
+    ssize_t buf_idx;
     char *buf; // remote send from, server recv into
     struct remote_ctx *recv_ctx;
     struct remote_ctx *send_ctx;
diff --git a/src/server.h b/src/server.h
index 16c3c6cf..44769055 100644
--- a/src/server.h
+++ b/src/server.h
@@ -56,7 +56,7 @@ struct server
     int fd;
     int stage;
     ssize_t buf_len;
-    int buf_idx;
+    ssize_t buf_idx;
     char *buf; // server send from, remote recv into
     asyncns_query_t *query;
     struct enc_ctx *e_ctx;
@@ -78,7 +78,7 @@ struct remote
 {
     int fd;
     ssize_t buf_len;
-    int buf_idx;
+    ssize_t buf_idx;
     char *buf; // remote send from, server recv into
     struct remote_ctx *recv_ctx;
     struct remote_ctx *send_ctx;
diff --git a/src/tunnel.h b/src/tunnel.h
index dae51207..8bfc8ba2 100644
--- a/src/tunnel.h
+++ b/src/tunnel.h
@@ -53,7 +53,7 @@ struct server
 {
     int fd;
     ssize_t buf_len;
-    int buf_idx;
+    ssize_t buf_idx;
     char *buf; // server send from, remote recv into
     struct enc_ctx *e_ctx;
     struct enc_ctx *d_ctx;
@@ -75,7 +75,7 @@ struct remote
 {
     int fd;
     ssize_t buf_len;
-    int buf_idx;
+    ssize_t buf_idx;
     char *buf; // remote send from, server recv into
     struct remote_ctx *recv_ctx;
     struct remote_ctx *send_ctx;