From: Steven Barth Date: Tue, 18 Nov 2014 09:25:22 +0000 (+0100) Subject: Be less verbose by default and add -v flag X-Git-Tag: debian/1.1+git20160131-1~44 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=80459c5a1fc82b9c63f3c1daa56783bee1b9d153;p=odhcp6c.git Be less verbose by default and add -v flag --- diff --git a/src/odhcp6c.c b/src/odhcp6c.c index 61ffe9d..89dfd36 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -66,6 +66,7 @@ int main(_unused int argc, char* const argv[]) int ia_pd_iaid_index = 0; static struct in6_addr ifid = IN6ADDR_ANY_INIT; int sol_timeout = DHCPV6_SOL_MAX_RT; + int verbosity = 0; bool help = false, daemonize = false; @@ -73,7 +74,7 @@ int main(_unused int argc, char* const argv[]) int c; unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE; - while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fa")) != -1) { + while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fav")) != -1) { switch (c) { case 'S': allow_slaac_only = (optarg) ? atoi(optarg) : -1; @@ -211,6 +212,10 @@ int main(_unused int argc, char* const argv[]) client_options &= ~DHCPV6_ACCEPT_RECONFIGURE; break; + case 'v': + ++verbosity; + break; + default: help = true; break; @@ -218,6 +223,9 @@ int main(_unused int argc, char* const argv[]) } openlog("odhcp6c", logopt, LOG_DAEMON); + if (!verbosity) + setlogmask(LOG_UPTO(LOG_WARNING)); + const char *ifname = argv[optind]; if (help || !ifname) @@ -437,7 +445,7 @@ static int usage(void) " -p Set pidfile (/var/run/odhcp6c.pid)\n" " -d Daemonize\n" " -e Write logmessages to stderr\n" - //" -v Increase logging verbosity\n" + " -v Increase logging verbosity\n" " -h Show this help\n\n"; write(STDERR_FILENO, buf, sizeof(buf)); return 1;