From d13e57242e32a438d1182bdf02488995f2977f5b Mon Sep 17 00:00:00 2001
Message-Id: <d13e57242e32a438d1182bdf02488995f2977f5b.1714024524.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 17 May 2003 11:02:12 +0000
Subject: [PATCH] Document the new `-b' option.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 doc/tripe.8 | 22 ++++++++++++++++------
 tripe.c     | 16 ++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/doc/tripe.8 b/doc/tripe.8
index caacbe79..262b2344 100644
--- a/doc/tripe.8
+++ b/doc/tripe.8
@@ -37,12 +37,20 @@ tripe \- a simple VPN daemon
 .RB [ \-D ]
 .RB [ \-d
 .IR dir ]
+.RB [ \-b
+.IR addr ]
 .RB [ \-p
 .IR port ]
+.br
+	
 .RB [ \-U
 .IR user ]
 .RB [ \-G
 .IR group ]
+.RB [ \-a
+.IR socket ]
+.RB [ \-T
+.IR trace-opts ]
 .br
 	
 .RB [ \-k
@@ -51,12 +59,6 @@ tripe \- a simple VPN daemon
 .IR pub-keyring ]
 .RB [ \-t
 .IR key-tag ]
-.br
-	
-.RB [ \-a
-.IR socket ]
-.RB [ \-T
-.IR trace-opts ]
 .SH "DESCRIPTION"
 The
 .B tripe
@@ -166,6 +168,14 @@ Give a current directory of
 .B .
 if you don't want it to change directory at all.
 .TP
+.BI "\-b, \-\-bind-address="addr
+Bind the UDP socket to IP address
+.I addr
+rather than the default of
+.BR INADDR_ANY .
+This is useful if your main globally-routable IP address is one you want
+to tunnel through the VPN.
+.TP
 .BI "\-p, \-\-port=" port
 Use the specified UDP port for all communications with peers, rather
 than an arbitarary kernel-assigned port.
diff --git a/tripe.c b/tripe.c
index e0985966..adbd7a11 100644
--- a/tripe.c
+++ b/tripe.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: tripe.c,v 1.10 2003/05/16 12:09:03 mdw Exp $
+ * $Id: tripe.c,v 1.11 2003/05/17 11:02:03 mdw Exp $
  *
  * Main program
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tripe.c,v $
+ * Revision 1.11  2003/05/17 11:02:03  mdw
+ * Document the new `-b' option.
+ *
  * Revision 1.10  2003/05/16 12:09:03  mdw
  * Allow binding to a chosen address.
  *
@@ -109,9 +112,9 @@ void interval(struct timeval *tv, void *v)
 
 static void usage(FILE *fp)
 {
-  pquis(fp, "Usage: $ [-D] [-d dir] [-p port] [-U user] [-G group]\n\
-	[-k priv-keyring] [-K pub-keyring] [-t key-tag]\n\
-	[-a socket] [-T trace-opts]\n");
+  pquis(fp, "Usage: $ [-D] [-d dir] [-b addr] [-p port]\n\
+	[-U user] [-G group] [-a socket] [-T trace-opts]\n\
+	[-k priv-keyring] [-K pub-keyring] [-t key-tag]\n");
 }
 
 static void version(FILE *fp)
@@ -133,9 +136,10 @@ Options:\n\
 \n\
 -D, --daemon		Run in the background.\n\
 -d, --directory=DIR	Switch to directory DIR (default $TRIPEDIR).\n\
+-b, --bind-address=ADDR	Bind UDP socket to this IP ADDR.\n\
 -p, --port=PORT		Select UDP port to listen to.\n\
--u, --setuid=USER	Set uid to USER after initialization.\n\
--g, --setgid=GROUP	Set gid to GROUP after initialization.\n\
+-U, --setuid=USER	Set uid to USER after initialization.\n\
+-G, --setgid=GROUP	Set gid to GROUP after initialization.\n\
 -k, --priv-keyring=FILE	Get private key from FILE.\n\
 -K, --pub-keyring=FILE	Get public keys from FILE.\n\
 -t, --tag=KEYTAG	Use private key labelled TAG.\n\
-- 
[mdw]