socsvn commit: r290015 - soc2015/roam/ayiya_listen

[roam at FreeBSD.org]

Author: roam
Date: Fri Aug 21 15:42:42 2015
New Revision: 290015
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=290015

Log:
  Fix ayiya_listen's getopt() call and usage message.
  
  Remove some options that were left over from ayiya_resp.
  
  ObQuote:	"I, me, mine"

Modified:
  soc2015/roam/ayiya_listen/main.c

Modified: soc2015/roam/ayiya_listen/main.c
==============================================================================
--- soc2015/roam/ayiya_listen/main.c	Fri Aug 21 15:42:39 2015	(r290014)
+++ soc2015/roam/ayiya_listen/main.c	Fri Aug 21 15:42:42 2015	(r290015)
@@ -80,7 +80,6 @@
 static int		ng_cs, ng_ds;
 static const char	*resppath;
 
-static int		quiet;
 static int		verbose;
 
 static void		usage(int _ferr);
@@ -114,7 +113,7 @@
 
 	hflag = Vflag = 0;
 	addr = tunnelsfile = NULL;
-	while (ch = getopt(argc, argv, "a:hqr:t:Vv"), ch != -1)
+	while (ch = getopt(argc, argv, "a:hr:t:Vv"), ch != -1)
 		switch (ch) {
 			case 'a':
 				if (addr != NULL)
@@ -126,10 +125,6 @@
 				hflag = 1;
 				break;
 
-			case 'q':
-				quiet = 1;
-				break;
-
 			case 'r':
 				resppath = optarg;
 				break;
@@ -254,13 +249,10 @@
 {
 	const char * const s =
 	    "Usage:\tayiya_listen [-v] -a address -r resppath -t tunnelsfile config\n"
-	    "\tayiya_listen [-qv] loop\n"
 	    "\tayiya_listen -V | -h\n"
 	    "\n"
 	    "\t-a\tspecify the IPv4 address to listen on\n"
 	    "\t-h\tdisplay program usage information and exit\n"
-	    "\t-n\tspecify the name of the AYIYA node to accept the connection\n"
-	    "\t-q\tquiet mode; only respond, do not originate AYIYA packets\n"
 	    "\t-r\tspecify the path to the ayiya_resp executable\n"
 	    "\t-t\tspecify the path to the tunnel information file\n"
 	    "\t-V\tdisplay program version information and exit\n"