@@ -1,6 +1,6 @@

 userv-utils (0.2.0) unstable; urgency=low

-  * ipif/INSTALL instructions slightly improved, slattach patch included.
+  * ipif/INSTALL instructions &c improved, slattach patch included.

  --

diff --git a/README b/README
index 00a404a..dfe735b 100644 (file)
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ Key to the Status:
    X   Incomplete.  Much extra stuff is required.
  Second letter is general status:
    Y   Released; hopefully of production quality.
-   B   Beta.  Not released, but hopefully useful with care.
+   B   Beta.  Not fully released, but hopefully useful with care.
    A   Alpha.  Probably buggy.  Not well tested or widely used.
    X   Example/experimental - for documentation purposes only,
         not recommended for use.

diff --git a/changelog b/changelog
index 35580e4..b2bb618 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
 userv-utils (0.2.0) unstable; urgency=low
 
-  * ipif/INSTALL instructions slightly improved, slattach patch included.
+  * ipif/INSTALL instructions &c improved, slattach patch included.
 
  --
 

diff --git a/ipif/INSTALL b/ipif/INSTALL
index 471a6ef..c2aabee 100644 (file)
--- a/ipif/INSTALL
+++ b/ipif/INSTALL
@@ -1,6 +1,20 @@
-NB that this is a very bare set of installation instructions !  It
-describes a `default' configuration; you can do more esoteric things
-if you wish.
+This directory contains:
+
+* A userv service (`ipif') for allowing users to create network
+interfaces and handle the traffic for them.  For instructions, see the
+comment at the top of service.c.
+
+* A VPN tunnelling system based on that userv service, which does
+encryption and can be used to join two networks.  It uses its own
+nonstandard protocols, not IPSEC.  Key setup is done via an ssh
+connection.  For installation instructions, read this file.
+
+These tools have only been tested on GNU/Linux, and the ipif service
+in particular uses the Linux-specific `slattach' utility.
+
+NB that this is a very bare set of installation instructions for the
+VPN system !  It describes a fairly `default' configuration; you can
+do more esoteric things if you wish.
 
 
 In any case, on each tunnel endpoint system (not the eventual
@@ -193,4 +207,4 @@ earlier.  The relevant Debian bug reports are #45515 (now closed) and
 `slattach.diff'.
 
 
-$Id: INSTALL,v 1.2 2000/08/10 00:18:31 ian Exp $
+$Id: INSTALL,v 1.3 2000/08/13 20:23:23 ian Exp $

diff --git a/ipif/forwarder.c b/ipif/forwarder.c
index 793ad24..152bf08 100644 (file)
--- a/ipif/forwarder.c
+++ b/ipif/forwarder.c
@@ -1,5 +1,5 @@
 /*
- * Encrypting tunnel for userv-ipif tunnels, actual implementation
+ * Encrypting tunnel for userv-ipif tunnels, actual core implementation
  */
 /*
  * usage:
@@ -24,7 +24,7 @@
  * writer to reader first, then keys for packets from reader to
  * writer.
  *
- * Every must be numeric.  There is very little argument checking.
+ * Every addr or port must be numeric.  There is very little argument checking.
  *
  * Exit status:
  *  SIGALARM   timed out

diff --git a/ipif/service.c b/ipif/service.c
index 6889f47..af1ce3c 100644 (file)
--- a/ipif/service.c
+++ b/ipif/service.c
@@ -34,7 +34,7 @@
  * Should be run from userv with no-disconnect-hup.
  */
 /*
- * Copyright (C) 1999 Ian Jackson
+ * Copyright (C) 1999-2000 Ian Jackson
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
  * along with userv-utils; if not, write to the Free Software
  * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: service.c,v 1.11 2000/06/21 22:48:29 ian Exp $
+ * $Id: service.c,v 1.12 2000/08/13 20:23:23 ian Exp $
  */
 
 #include <stdio.h>