From 89e0fbfaa777ef28b5269421cc6770589145d4e6 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 16 Feb 2023 16:43:11 +1100 Subject: tcp: Remove 'zero_len' goto from tcp_data_from_sock This goto exists purely to move this exception case out of line. Although that does make the "normal" path a little clearer, it comes at the cost of not knowing how where control will flow after jumping to the zero_len label. The exceptional case isn't that long, so just put it inline. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- tcp.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'tcp.c') diff --git a/tcp.c b/tcp.c index d289f10..81468d9 100644 --- a/tcp.c +++ b/tcp.c @@ -2193,8 +2193,18 @@ static int tcp_data_from_sock(struct ctx *c, struct tcp_tap_conn *conn) if (len < 0) goto err; - if (!len) - goto zero_len; + if (!len) { + if ((conn->events & (SOCK_FIN_RCVD | TAP_FIN_SENT)) == SOCK_FIN_RCVD) { + if ((ret = tcp_send_flag(c, conn, FIN | ACK))) { + tcp_rst(c, conn); + return ret; + } + + conn_event(c, conn, TAP_FIN_SENT); + } + + return 0; + } sendlen = len - already_sent; if (sendlen <= 0) { @@ -2233,18 +2243,6 @@ err: } return ret; - -zero_len: - if ((conn->events & (SOCK_FIN_RCVD | TAP_FIN_SENT)) == SOCK_FIN_RCVD) { - if ((ret = tcp_send_flag(c, conn, FIN | ACK))) { - tcp_rst(c, conn); - return ret; - } - - conn_event(c, conn, TAP_FIN_SENT); - } - - return 0; } /** -- cgit v1.2.3