From bb41901c719f9ba422b538f773025dad5c398823 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 18 Sep 2024 11:53:07 +1000 Subject: [PATCH] tcp: Make tcp_update_seqack_wnd()s force_seq parameter explicitly boolean This parameter is already treated as a boolean internally. Make it a 'bool' type for clarity. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- tcp.c | 6 +++--- tcp_buf.c | 2 +- tcp_internal.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tcp.c b/tcp.c index 92ac164..787df63 100644 --- a/tcp.c +++ b/tcp.c @@ -1020,7 +1020,7 @@ size_t tcp_l2_buf_fill_headers(const struct tcp_tap_conn *conn, * Return: 1 if sequence or window were updated, 0 otherwise */ int tcp_update_seqack_wnd(const struct ctx *c, struct tcp_tap_conn *conn, - int force_seq, struct tcp_info *tinfo) + bool force_seq, struct tcp_info *tinfo) { uint32_t prev_wnd_to_tap = conn->wnd_to_tap << conn->ws_to_tap; uint32_t prev_ack_to_tap = conn->seq_ack_to_tap; @@ -1157,7 +1157,7 @@ int tcp_prepare_flags(const struct ctx *c, struct tcp_tap_conn *conn, if (!(conn->flags & LOCAL)) tcp_rtt_dst_check(conn, &tinfo); - if (!tcp_update_seqack_wnd(c, conn, flags, &tinfo) && !flags) + if (!tcp_update_seqack_wnd(c, conn, !!flags, &tinfo) && !flags) return 0; *optlen = 0; @@ -2240,7 +2240,7 @@ void tcp_sock_handler(const struct ctx *c, union epoll_ref ref, tcp_data_from_sock(c, conn); if (events & EPOLLOUT) - tcp_update_seqack_wnd(c, conn, 0, NULL); + tcp_update_seqack_wnd(c, conn, false, NULL); return; } diff --git a/tcp_buf.c b/tcp_buf.c index c886c92..83f91a3 100644 --- a/tcp_buf.c +++ b/tcp_buf.c @@ -511,7 +511,7 @@ int tcp_buf_data_from_sock(const struct ctx *c, struct tcp_tap_conn *conn) last_len = sendlen - (send_bufs - 1) * mss; /* Likely, some new data was acked too. */ - tcp_update_seqack_wnd(c, conn, 0, NULL); + tcp_update_seqack_wnd(c, conn, false, NULL); /* Finally, queue to tap */ dlen = mss; diff --git a/tcp_internal.h b/tcp_internal.h index bd634be..a450d85 100644 --- a/tcp_internal.h +++ b/tcp_internal.h @@ -93,7 +93,7 @@ size_t tcp_l2_buf_fill_headers(const struct tcp_tap_conn *conn, struct iovec *iov, size_t dlen, const uint16_t *check, uint32_t seq); int tcp_update_seqack_wnd(const struct ctx *c, struct tcp_tap_conn *conn, - int force_seq, struct tcp_info *tinfo); + bool force_seq, struct tcp_info *tinfo); int tcp_prepare_flags(const struct ctx *c, struct tcp_tap_conn *conn, int flags, struct tcphdr *th, char *data, size_t *optlen);