aboutgitcodebugslistschat
path: root/tap.c
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2023-01-06 11:43:19 +1100
committerStefano Brivio <sbrivio@redhat.com>2023-01-23 18:54:57 +0100
commit0fb7b2b9080afd6dc97d2909015a1a6f3e721a73 (patch)
tree16da0d2a9fba56e99b712d47f5ce4918b9d35391 /tap.c
parent2416310a17e37c61787a8d4366d09255cd784266 (diff)
downloadpasst-0fb7b2b9080afd6dc97d2909015a1a6f3e721a73.tar
passt-0fb7b2b9080afd6dc97d2909015a1a6f3e721a73.tar.gz
passt-0fb7b2b9080afd6dc97d2909015a1a6f3e721a73.tar.bz2
passt-0fb7b2b9080afd6dc97d2909015a1a6f3e721a73.tar.lz
passt-0fb7b2b9080afd6dc97d2909015a1a6f3e721a73.tar.xz
passt-0fb7b2b9080afd6dc97d2909015a1a6f3e721a73.tar.zst
passt-0fb7b2b9080afd6dc97d2909015a1a6f3e721a73.zip
tap: Use different io vector bases depending on tap type
Currently tap_send_frames() expects the frames it is given to include the vnet_len field, even in pasta mode which doesn't use it (although it need not be initialized in that case). To match, tap_iov_base() and tap_iov_len() construct the frame in that way. This will inconvenience future changes, so alter things to set the buffers to include just the frame needed by the tap backend type. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'tap.c')
-rw-r--r--tap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/tap.c b/tap.c
index d0dd72c..5ec6b70 100644
--- a/tap.c
+++ b/tap.c
@@ -317,8 +317,7 @@ static void tap_send_frames_pasta(struct ctx *c,
size_t i;
for (i = 0; i < n; i++) {
- if (write(c->fd_tap, (char *)iov->iov_base + 4,
- iov->iov_len - 4) < 0) {
+ if (write(c->fd_tap, (char *)iov->iov_base, iov->iov_len) < 0) {
debug("tap write: %s", strerror(errno));
if (errno != EAGAIN && errno != EWOULDBLOCK)
tap_handler(c, c->fd_tap, EPOLLERR, NULL);
@@ -383,7 +382,7 @@ void tap_send_frames(struct ctx *c, const struct iovec *iov, size_t n)
else
tap_send_frames_pasta(c, iov, n);
- pcap_multiple(iov, n, sizeof(uint32_t));
+ pcap_multiple(iov, n, c->mode == MODE_PASST ? sizeof(uint32_t) : 0);
}
/**