Merge branch 'master' of login.chiark.greenend.org.uk:/home/ian/public-git/userv-utils

1 files changed, 4 insertions, 2 deletions

diff --git a/ipif/service.c b/ipif/service.c
index 4c9b524..b9e40e2 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);
@@ -861,7 +863,7 @@ static void copydata(void) {
       r= read(0, input_buf + input_waiting, want);
       if (r>0) {
 	input_waiting += r;
-	assert(r < sizeof(input_buf));
+	assert(input_waiting <= sizeof(input_buf));
 	more_rx_data(input_buf, rx_packet_buf);
       } else if (r==0) {
 	terminate(0);