@@ -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 00a404a6232adb496807b91ac4b58058db80865b..dfe735bd28fd17c162cbb18ec595da0b28b52203 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.
    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.
    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 35580e433af94b2c0a9df53082af80a2c29dedfa..b2bb618e0d99fa7ee22cd79b0ae51a856d554bd9 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
 userv-utils (0.2.0) unstable; urgency=low
 
 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/debian/changelog b/debian/changelog
index 35580e433af94b2c0a9df53082af80a2c29dedfa..b2bb618e0d99fa7ee22cd79b0ae51a856d554bd9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 userv-utils (0.2.0) unstable; urgency=low
 
 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 b18e41382e2473724a746aa82286c33fffcbb832..6f23ec6ab1dab5363457992453e0a8ca35c3233f 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
 
 
 In any case, on each tunnel endpoint system (not the eventual

diff --git a/ipif/forwarder.c b/ipif/forwarder.c
index 793ad24e787b3d50be3732668d809a2dd56d679d..152bf08eecde5580ec82d023dda1de1464bbd1e4 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:
  */
 /*
  * usage:


@@ -24,7 +24,7 @@
  * writer to reader first, then keys for packets from reader to
  * writer.
  *
  * 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
  *
  * Exit status:
  *  SIGALARM   timed out

diff --git a/ipif/service.c b/ipif/service.c
index 2edf4a6588721ab928eb398a06f70be66fd894c3..97351e6c09dfca4074dca6a0de2ba9b6d3f2c017 100644 (file)
--- a/ipif/service.c
+++ b/ipif/service.c
@@ -34,7 +34,7 @@
  * Should be run from userv with no-disconnect-hup.
  */
 /*
  * 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
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by