From 03203c8a42124de66a5e8d5eee2e5b86a3ec44cf Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 14 Jan 2012 15:47:08 +0000 Subject: [PATCH] ipif fixes --- debian/changelog | 9 +++++++++ ipif/service.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0c3b57f..35d54fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +userv-utils (0.4.1) unstable; urgency=low + + ipif bugfixes: + * Ignore empty packets (ie consecutive END bytes), as tun rejects + them with EINVAL. + * Tolerate ENOMEM from tun. + + -- Ian Jackson Sat, 14 Jan 2012 15:46:53 +0000 + userv-utils (0.4) unstable; urgency=low ipif: diff --git a/ipif/service.c b/ipif/service.c index 670b447..b9d8b44 100644 --- a/ipif/service.c +++ b/ipif/service.c @@ -719,11 +719,13 @@ static void setnonblock(int fd) { } static void rx_packet(const uint8_t *packet, int len) { + if (!len) + return; for (;;) { int r= write(tunfd, packet, len); if (r<0) { if (errno==EINTR) continue; - if (errno==EAGAIN) return; /* oh well */ + if (errno==EAGAIN || errno==ENOMEM) return; /* oh well */ sysfatal("error writing packet to tun (transmitting)"); } assert(r==len); -- 2.30.2