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=670b44706be087221e882eb69b9c61cf5e02ecef;hb=44a77f4851d3c819f9b364018a9695f332758a71;hpb=8acaed657eb4db47c448c8a582810bf301ff47ef

diff --git a/ipif/service.c b/ipif/service.c
index 670b447..b9e40e2 100644
--- a/ipif/service.c
+++ b/ipif/service.c
@@ -32,9 +32,9 @@
  *
  *  <local-addr>,<peer-addr>,<mtu>,<proto>
  *
- *      As for slattach.  Supported protocols are slip, cslip, and
- *      adaptive.  Alternatively, set to `debug' to print debugging info
- *      and exit.  <local-addr> is address of the interface to be created
+ *      As for slattach.  The only supported protocol is slip.
+ *      Alternatively, set to `debug' to print debugging info and
+ *      exit.  <local-addr> is address of the interface to be created
  *      on the local system; <peer-addr> is the address of the
  *      point-to-point peer.  They must be actual addresses (not
  *      hostnames).
@@ -48,9 +48,9 @@
  *      not supported).  If no additional routes are to be set up, use `-'
  *      or supply an empty argument.
  *
- * Each <config> item - whether a line file such as
- * /etc/userv/ipif-networks, or supplied on the service program
- * command line - is one of:
+ * Each <config> item - whether a line in a file such as
+ * /etc/userv/ipif-networks, or the single trusted argument supplied
+ * on the service program command line - is one of:
  *
  *   /<config-file-name>
  *   ./<config-file-name>
@@ -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);