From owner-svn-soc-all@freebsd.org Fri Aug 21 15:42:44 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77D919BFE0B for ; Fri, 21 Aug 2015 15:42:44 +0000 (UTC) (envelope-from roam@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68DDC30F for ; Fri, 21 Aug 2015 15:42:44 +0000 (UTC) (envelope-from roam@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LFgijJ050071 for ; Fri, 21 Aug 2015 15:42:44 GMT (envelope-from roam@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7LFghLf050052 for svn-soc-all@FreeBSD.org; Fri, 21 Aug 2015 15:42:43 GMT (envelope-from roam@FreeBSD.org) Date: Fri, 21 Aug 2015 15:42:43 GMT Message-Id: <201508211542.t7LFghLf050052@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to roam@FreeBSD.org using -f From: roam@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r290015 - soc2015/roam/ayiya_listen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Aug 2015 15:42:44 -0000 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"