1
0
Fork 0
mirror of https://passt.top/passt synced 2025-06-11 01:55:34 +02:00

tap: Rename tap_iov_{base,len}

These two functions are typically used to calculate values to go into the
iov_base and iov_len fields of a struct iovec.  They don't have to be used
for that, though.  Rename them in terms of what they actually do: calculate
the base address and total length of the complete frame, including both L2
and tap specific headers.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2024-03-08 17:53:25 +11:00 committed by Stefano Brivio
parent 4db947d17c
commit d3eb0d7b59
3 changed files with 17 additions and 17 deletions

12
tcp.c
View file

@ -1014,10 +1014,10 @@ static void tcp_sock4_iov_init(const struct ctx *c)
}
for (i = 0, iov = tcp4_l2_iov; i < TCP_FRAMES_MEM; i++, iov++)
iov->iov_base = tap_iov_base(c, &tcp4_l2_buf[i].taph);
iov->iov_base = tap_frame_base(c, &tcp4_l2_buf[i].taph);
for (i = 0, iov = tcp4_l2_flags_iov; i < TCP_FRAMES_MEM; i++, iov++)
iov->iov_base = tap_iov_base(c, &tcp4_l2_flags_buf[i].taph);
iov->iov_base = tap_frame_base(c, &tcp4_l2_flags_buf[i].taph);
}
/**
@ -1045,10 +1045,10 @@ static void tcp_sock6_iov_init(const struct ctx *c)
}
for (i = 0, iov = tcp6_l2_iov; i < TCP_FRAMES_MEM; i++, iov++)
iov->iov_base = tap_iov_base(c, &tcp6_l2_buf[i].taph);
iov->iov_base = tap_frame_base(c, &tcp6_l2_buf[i].taph);
for (i = 0, iov = tcp6_l2_flags_iov; i < TCP_FRAMES_MEM; i++, iov++)
iov->iov_base = tap_iov_base(c, &tcp6_l2_flags_buf[i].taph);
iov->iov_base = tap_frame_base(c, &tcp6_l2_flags_buf[i].taph);
}
/**
@ -1454,14 +1454,14 @@ static size_t tcp_l2_buf_fill_headers(const struct ctx *c,
ip_len = tcp_fill_headers4(c, conn, &b->iph, &b->th, plen,
check, seq);
tlen = tap_iov_len(c, &b->taph, ip_len);
tlen = tap_frame_len(c, &b->taph, ip_len);
} else {
struct tcp6_l2_buf_t *b = (struct tcp6_l2_buf_t *)p;
ip_len = tcp_fill_headers6(c, conn, &b->ip6h, &b->th, plen,
seq);
tlen = tap_iov_len(c, &b->taph, ip_len);
tlen = tap_frame_len(c, &b->taph, ip_len);
}
return tlen;