miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Create a tcp_entry only on ACK

Browse Source
This commit is contained in:
angt
2016-01-17 10:18:39 +01:00
parent 33356d5d35
commit 1815ea519f
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.c
View File

@@ -620,7 +620,7 @@ int sa_have (struct seq_array *sa, uint32_t seq, uint32_t size)
if (d+size>sa->elem[i].size) { if (d+size>sa->elem[i].size) {
gt_print("sa_have:part\n"); gt_print("sa_have:part\n");
return 1; // XXX 0 return 0; // XXX 0
} }
} }
@@ -882,9 +882,8 @@ static int gt_track (uint8_t **db, struct ip_common *ic, uint8_t *data, int rev)
return 0; return 0;
} }
uint32_t size = ic->size-ic->hdr_size-tcp.th_off*4; if (tcp.th_flags&TH_ACK) {
if (!r_entry) {
if (size && !r_entry) {
r_entry = calloc(1, sizeof(entry)); r_entry = calloc(1, sizeof(entry));
if (!r_entry) if (!r_entry)
@@ -896,25 +895,29 @@ static int gt_track (uint8_t **db, struct ip_common *ic, uint8_t *data, int rev)
free(r_entry); free(r_entry);
return 0; return 0;
} }
gt_print_entry(r_entry);
r_entry->data[1-rev].sa.base = tcp.th_ack;
r_entry->data[rev].sa.base = tcp.th_seq;
} else {
sa_rebase(&r_entry->data[1-rev].sa, tcp.th_ack);
}
} }
if (!r_entry) if (!r_entry)
return 0; return 0;
if (r_entry->data[1-rev].sa.count && (tcp.th_flags&TH_ACK)) uint32_t size = ic->size-ic->hdr_size-tcp.th_off*4;
sa_rebase(&r_entry->data[1-rev].sa, tcp.th_ack);
if (!size) if (!size)
return 0; return 0;
if (r_entry->data[rev].sa.count) { if (sa_have(&r_entry->data[rev].sa, tcp.th_seq, size)) {
if (sa_have(&r_entry->data[rev].sa, tcp.th_seq, size))
r_entry->data[rev].retrans++; r_entry->data[rev].retrans++;
} else { } else {
r_entry->data[rev].sa.base = tcp.th_seq;
}
sa_insert(&r_entry->data[rev].sa, tcp.th_seq, size); sa_insert(&r_entry->data[rev].sa, tcp.th_seq, size);
}
return 0; return 0;
} }