mirror of
https://passt.top/passt
synced 2024-12-22 05:35:23 +00:00
tcp: Rearrange logic for setting ACK flag in tcp_send_flag()
We have different paths for controlling the ACK flag for the SYN and !SYN paths. This amounts to sometimes forcing on the ACK flag in the !SYN path regardless of options. We can rearrange things to explicitly be that which will make things neater for some future changes. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
99355e25b9
commit
16c2d8da0d
9
tcp.c
9
tcp.c
@ -1674,16 +1674,15 @@ static int tcp_send_flag(struct ctx *c, struct tcp_tap_conn *conn, int flags)
|
||||
*data++ = OPT_WS;
|
||||
*data++ = OPT_WS_LEN;
|
||||
*data++ = conn->ws_to_tap;
|
||||
|
||||
th->ack = !!(flags & ACK);
|
||||
} else {
|
||||
th->ack = !!(flags & ACK)) ||
|
||||
conn->seq_ack_to_tap != prev_ack_to_tap ||
|
||||
!prev_wnd_to_tap;
|
||||
if (conn->seq_ack_to_tap != prev_ack_to_tap ||
|
||||
!prev_wnd_to_tap)
|
||||
flags |= ACK;
|
||||
}
|
||||
|
||||
th->doff = (sizeof(*th) + optlen) / 4;
|
||||
|
||||
th->ack = !!(flags & ACK);
|
||||
th->rst = !!(flags & RST);
|
||||
th->syn = !!(flags & SYN);
|
||||
th->fin = !!(flags & FIN);
|
||||
|
Loading…
Reference in New Issue
Block a user