aboutgitcodebugslistschat
path: root/tcp_splice.c
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2024-05-21 15:57:05 +1000
committerStefano Brivio <sbrivio@redhat.com>2024-05-22 23:20:58 +0200
commit0060acd11b191e0699e2c588a565c4929523db06 (patch)
treef5b7818c7292c2d7641261a200a98feceb93d4dd /tcp_splice.c
parenta63199832a737dde45500e4037608727701c782f (diff)
downloadpasst-0060acd11b191e0699e2c588a565c4929523db06.tar
passt-0060acd11b191e0699e2c588a565c4929523db06.tar.gz
passt-0060acd11b191e0699e2c588a565c4929523db06.tar.bz2
passt-0060acd11b191e0699e2c588a565c4929523db06.tar.lz
passt-0060acd11b191e0699e2c588a565c4929523db06.tar.xz
passt-0060acd11b191e0699e2c588a565c4929523db06.tar.zst
passt-0060acd11b191e0699e2c588a565c4929523db06.zip
flow: Clarify and enforce flow state transitions
Flows move over several different states in their lifetime. The rules for these are documented in comments, but they're pretty complex and a number of the transitions are implicit, which makes this pretty fragile and error prone. Change the code to explicitly track the states in a field. Make all transitions explicit and logged. To the extent that it's practical in C, enforce what can and can't be done in various states with ASSERT()s. While we're at it, tweak the docs to clarify the restrictions on each state a bit. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'tcp_splice.c')
-rw-r--r--tcp_splice.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tcp_splice.c b/tcp_splice.c
index fb00bc2..852a93b 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -471,7 +471,7 @@ bool tcp_splice_conn_from_sock(const struct ctx *c,
return false;
}
- conn = FLOW_START(flow, FLOW_TCP_SPLICE, tcp_splice, 0);
+ conn = FLOW_SET_TYPE(flow, FLOW_TCP_SPLICE, tcp_splice, 0);
conn->flags = af == AF_INET ? 0 : SPLICE_V6;
conn->s[0] = s0;
@@ -485,6 +485,8 @@ bool tcp_splice_conn_from_sock(const struct ctx *c,
if (tcp_splice_connect(c, conn, af, pif1, dstport))
conn_flag(c, conn, CLOSING);
+ FLOW_ACTIVATE(conn);
+
return true;
}