mirror of
https://passt.top/passt
synced 2025-06-08 16:45:35 +02:00
tcp: Move socket pool declarations around
tcp_splice.c has some explicit extern declarations to access the socket pools. This is pretty dangerous - if we changed the type of these variables in tcp.c, we'd have tcp.c and tcp_splice.c using the same memory in different ways with no compiler error. So, move the extern declarations to tcp_conn.h so they're visible to both tcp.c and tcp_splice.c, but not the rest of pasta. In fact the pools for the guest namespace are necessarily only used by tcp_splice.c - we have no sockets on the guest side if we're not splicing. So move those declarations and the functions that deal exclusively with them to tcp_splice.c Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
c8993476d5
commit
912d37cd5b
4 changed files with 55 additions and 48 deletions
10
tcp_conn.h
10
tcp_conn.h
|
@ -182,11 +182,17 @@ union tcp_conn {
|
|||
/* TCP connections */
|
||||
extern union tcp_conn tc[];
|
||||
|
||||
/* Socket pools */
|
||||
#define TCP_SOCK_POOL_SIZE 32
|
||||
|
||||
extern int init_sock_pool4 [TCP_SOCK_POOL_SIZE];
|
||||
extern int init_sock_pool6 [TCP_SOCK_POOL_SIZE];
|
||||
|
||||
void tcp_splice_conn_update(struct ctx *c, struct tcp_splice_conn *new);
|
||||
void tcp_table_compact(struct ctx *c, union tcp_conn *hole);
|
||||
void tcp_splice_destroy(struct ctx *c, union tcp_conn *conn_union);
|
||||
void tcp_splice_timer(struct ctx *c, union tcp_conn *conn_union);
|
||||
void tcp_splice_pipe_refill(const struct ctx *c);
|
||||
|
||||
void tcp_sock_refill_pool(const struct ctx *c, int pool[], int af);
|
||||
void tcp_splice_refill(const struct ctx *c);
|
||||
|
||||
#endif /* TCP_CONN_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue