mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Native keep record of ACKed

This commit is contained in:
M66B 2016-02-13 14:46:03 +01:00
parent 84397de61b
commit 81ee9a2614
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/jni/netguard/netguard.h
View File

@ -143,6 +143,8 @@ struct tcp_session {
uint32_t remote_start;
uint32_t local_start;
uint32_t acked; // host notation
union {
__be32 ip4; // network notation
struct in6_addr ip6;

1
app/src/main/jni/netguard/session.c
View File

@ -344,6 +344,7 @@ int get_selects(const struct arguments *args, fd_set *rfds, fd_set *wfds, fd_set
FD_SET(t->socket, efds);
// Check for incoming data
// TODO take into account ACKed?
if (t->send_window > 0)
FD_SET(t->socket, rfds);

31
app/src/main/jni/netguard/tcp.c
View File

@ -293,9 +293,11 @@ void check_tcp_sockets(const struct arguments *args, fd_set *rfds, fd_set *wfds,
if (cur->state == TCP_ESTABLISHED || cur->state == TCP_CLOSE_WAIT) {
// Check socket read
// Send window can be changed in the mean time
if (FD_ISSET(cur->socket, rfds) && cur->send_window > 0) {
cur->time = time(NULL);
// TODO take into account ACKed?
size_t len = (cur->send_window > TCP_SEND_WINDOW
? TCP_SEND_WINDOW
: cur->send_window);
@ -462,6 +464,7 @@ jboolean handle_tcp(const struct arguments *args,
syn->local_seq = (uint32_t) rand(); // ISN local
syn->remote_start = syn->remote_seq;
syn->local_start = syn->local_seq;
syn->acked = 0;
if (version == 4) {
syn->saddr.ip4 = (__be32) ip4->saddr;
@ -531,11 +534,12 @@ jboolean handle_tcp(const struct arguments *args,
else {
char session[250];
sprintf(session,
"%s %s loc %u rem %u",
"%s %s loc %u rem %u acked %u",
packet,
strstate(cur->state),
cur->local_seq - cur->local_start,
cur->remote_seq - cur->remote_start);
cur->remote_seq - cur->remote_start,
cur->acked - cur->local_start);
// Session found
if (cur->state == TCP_CLOSING || cur->state == TCP_CLOSE) {
@ -627,6 +631,8 @@ jboolean handle_tcp(const struct arguments *args,
}
} else if (tcphdr->ack) {
cur->acked = ntohl(tcphdr->ack_seq);
if (cur->state == TCP_SYN_RECV)
cur->state = TCP_ESTABLISHED;
@ -657,7 +663,8 @@ jboolean handle_tcp(const struct arguments *args,
}
}
else {
if ((uint32_t) (ntohl(tcphdr->ack_seq) + 1) == cur->local_seq) {
uint32_t ack = ntohl(tcphdr->ack_seq);
if ((uint32_t) (ack + 1) == cur->local_seq) {
// Keep alive
int on = 1;
if (setsockopt(cur->socket, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)))
@ -666,15 +673,25 @@ jboolean handle_tcp(const struct arguments *args,
session, errno, strerror(errno));
else
log_android(ANDROID_LOG_WARN, "%s enabled keep alive", session);
}
else if (compare_u16(ntohl(tcphdr->ack_seq), cur->local_seq) < 0) {
log_android(ANDROID_LOG_WARN, "%s previous ACK %d",
session, ntohl(tcphdr->ack_seq) - cur->local_seq);
} else if (compare_u16(ack, cur->local_seq) < 0) {
if (compare_u16(ack, cur->acked) <= 0)
log_android(ack == cur->acked ? ANDROID_LOG_WARN : ANDROID_LOG_ERROR,
"%s repeated ACK %u/%u",
session,
ack - cur->local_start, cur->acked - cur->local_start);
else {
log_android(ANDROID_LOG_WARN, "%s previous ACK %d",
session, ack - cur->local_seq);
cur->acked = ack;
}
// TODO terminate connection if difference too large
return 1;
}
else {
log_android(ANDROID_LOG_ERROR, "%s future ACK", session);
write_rst(args, cur);
return 0;
}
}