X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/c953f4b5cab310c5d4ab7f16289bfdaece05667f..13a55605839046f6f42910de713f4a9b6c44dfd4:/mallory.c

diff --git a/mallory.c b/mallory.c
index c66b45f4..970e18e7 100644
--- a/mallory.c
+++ b/mallory.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mallory.c,v 1.2 2003/10/15 09:31:06 mdw Exp $
+ * $Id$
  *
  * An evil proxy for TrIPE
  *
@@ -26,17 +26,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mallory.c,v $
- * Revision 1.2  2003/10/15 09:31:06  mdw
- * Make forking work properly.
- *
- * Revision 1.1  2001/06/19 22:11:14  mdw
- * The beginnings of a malicious proxy for TrIPE.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -73,7 +62,6 @@
 #include <catacomb/key.h>
 
 #include <catacomb/mp.h>
-#include <catacomb/mpmont.h>
 #include <catacomb/mprand.h>
 #include <catacomb/dh.h>
 
@@ -622,7 +610,7 @@ static void version(FILE *fp)
 
 static void usage(FILE *fp)
 {
-  pquis(fp, "Usage: $ [-k keyring] directive...\n");
+  pquis(fp, "Usage: $ [-k KEYRING] DIRECTIVE...\n");
 }
 
 static void help(FILE *fp)
@@ -630,6 +618,28 @@ static void help(FILE *fp)
   version(fp);
   putc('\n', fp);
   usage(fp);
+  fputs("\n\
+Options:\n\
+\n\
+-h, --help		Show this help text.\n\
+-v, --version		Show the version number.\n\
+-u, --usage		Show terse usage summary.\n\
+\n\
+-k, --keyring=FILE	Fetch keys from FILE.\n\
+\n\
+Directives:\n\
+  peer:NAME:LOCAL-PORT:REMOTE-ADDR:REMOTE-PORT\n\
+  include:FILE\n\
+  {,l,r}filt:FILTER:ARGS:...\n\
+  next:TAG\n\
+  {,l,r}flood:TYPE:MILLIS:SIZE\n\
+\n\
+Filters:\n\
+  send\n\
+  fork:TAG\n\
+  delay:QLEN[:MILLIS:P-REPLAY]\n\
+  corrupt[:P-CORRUPT]\n",
+	fp);
 }
 
 int main(int argc, char *argv[])