aboutgitcodebugslistschat
path: root/tap.c
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2024-02-28 12:52:04 +1100
committerStefano Brivio <sbrivio@redhat.com>2024-02-29 06:35:01 +0100
commitdda7945ca9c9d2371fc37cfaed688f92bd627224 (patch)
treeb23b211da253b4a95bf0b1cd22941036ae71c04a /tap.c
parent8bdb0883b441441590589aac46f991c80e4f80f3 (diff)
downloadpasst-dda7945ca9c9d2371fc37cfaed688f92bd627224.tar
passt-dda7945ca9c9d2371fc37cfaed688f92bd627224.tar.gz
passt-dda7945ca9c9d2371fc37cfaed688f92bd627224.tar.bz2
passt-dda7945ca9c9d2371fc37cfaed688f92bd627224.tar.lz
passt-dda7945ca9c9d2371fc37cfaed688f92bd627224.tar.xz
passt-dda7945ca9c9d2371fc37cfaed688f92bd627224.tar.zst
passt-dda7945ca9c9d2371fc37cfaed688f92bd627224.zip
pcap: Handle short writes in pcap_frame()
Currently pcap_frame() assumes that if write() doesn't return an error, it has written everything we want. That's not necessarily true, because it could return a short write. That's not likely to happen on a regular file, but there's not a lot of reason not to be robust here; it's conceivable we might want to direct the pcap fd at a named pipe or similar. So, make pcap_frame() handle short frames by using the write_remainder() helper. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> [sbrivio: Formatting fix, and avoid gcc warning in pcap_frame()] Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'tap.c')
-rw-r--r--tap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tap.c b/tap.c
index dd11d1d..87d176b 100644
--- a/tap.c
+++ b/tap.c
@@ -433,7 +433,7 @@ size_t tap_send_frames(const struct ctx *c, const struct iovec *iov, size_t n)
if (m < n)
debug("tap: failed to send %zu frames of %zu", n - m, n);
- pcap_multiple(iov, m, c->mode == MODE_PASST ? sizeof(uint32_t) : 0);
+ pcap_multiple(iov, 1, n, c->mode == MODE_PASST ? sizeof(uint32_t) : 0);
return m;
}