From da99bca7a1808058962583b15aed3d7be1a4142a Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 8 Feb 2016 21:59:24 +0100 Subject: [PATCH] Native calculate receive window --- app/src/main/jni/netguard/netguard.c | 20 ++++++++++++-------- app/src/main/jni/netguard/netguard.h | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/jni/netguard/netguard.c b/app/src/main/jni/netguard/netguard.c index 56c7f43c..74921168 100644 --- a/app/src/main/jni/netguard/netguard.c +++ b/app/src/main/jni/netguard/netguard.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -2455,8 +2456,9 @@ jboolean handle_tcp(const struct arguments *args, rst.source = tcphdr->source; rst.dest = tcphdr->dest; - write_rst(args, &rst); + rst.socket = -1; + write_rst(args, &rst); return 0; } } @@ -3080,12 +3082,14 @@ ssize_t write_tcp(const struct arguments *args, const struct tcp_session *cur, csum = calc_checksum(0, (uint8_t *) &pseudo, sizeof(struct ip6_hdr_pseudo)); } - /* - int send_buf; - int olen = sizeof(send_buf); - if (!getsockopt(cur->socket, SOL_SOCKET, SO_SNDBUF, &send_buf, &olen)) - log_android(ANDROID_LOG_WARN, "Send buffer socket %d size %d", cur->socket, send_buf); - */ + int unsent = 0; + uint16_t window = TCP_RECV_WINDOW; + if (cur->socket >= 0) { + if (ioctl(cur->socket, SIOCOUTQ, &unsent)) + log_android(ANDROID_LOG_WARN, "ioctl SIOCOUTQ %d: %s", errno, strerror(errno)); + else + window = (uint16_t) (unsent < TCP_RECV_WINDOW ? TCP_RECV_WINDOW - unsent : 1); + } // Build TCP header memset(tcp, 0, sizeof(struct tcphdr)); @@ -3098,7 +3102,7 @@ ssize_t write_tcp(const struct arguments *args, const struct tcp_session *cur, tcp->ack = (__u16) ack; tcp->fin = (__u16) fin; tcp->rst = (__u16) rst; - tcp->window = htons(TCP_RECV_WINDOW); + tcp->window = htons(window); tcp->urg_ptr; if (!tcp->ack) diff --git a/app/src/main/jni/netguard/netguard.h b/app/src/main/jni/netguard/netguard.h index ab2e43ad..58961429 100644 --- a/app/src/main/jni/netguard/netguard.h +++ b/app/src/main/jni/netguard/netguard.h @@ -17,7 +17,7 @@ #define UDP_KEEP_TIMEOUT 60 // seconds #define UDP_TIMEOUT_SCALE 25 -#define TCP_RECV_WINDOW 16384 // bytes +#define TCP_RECV_WINDOW 16384 // bytes (maximum) #define TCP_SEND_WINDOW 16384 // bytes (maximum) #define TCP_INIT_TIMEOUT 30 // seconds ~net.inet.tcp.keepinit #define TCP_IDLE_TIMEOUT 300 // seconds ~net.inet.tcp.keepidle