X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=blobdiff_plain;f=ipif%2Fservice.c;h=b9e40e29fcdb3a2f26ccabf02122d49ab230d388;hp=4c9b52463623a2a2437f6f5c0d318724f8f102af;hb=44a77f4851d3c819f9b364018a9695f332758a71;hpb=447f36af68bf19c081a5dc0ead512babaf5f2ade

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);