lagertonne/tinc
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Wiki Activity

Import Upstream version 1.0.22

Browse source
This commit is contained in:
Guus Sliepen 2019-08-26 13:44:43 +02:00
parent 37abcfc1ea
commit 8dab3abc97
28 changed files with 2676 additions and 2126 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/tincd.c
View file

@ -178,7 +178,9 @@ static bool parse_options(int argc, char **argv) {
break;
#endif
case 'd': /* inc debug level */
case 'd': /* increase debug level */
if(!optarg && optind < argc && *argv[optind] != '-')
optarg = argv[optind++];
if(optarg)
debug_level = atoi(optarg);
else
@ -187,6 +189,8 @@ static bool parse_options(int argc, char **argv) {
case 'k': /* kill old tincds */
#ifndef HAVE_MINGW
if(!optarg && optind < argc && *argv[optind] != '-')
optarg = argv[optind++];
if(optarg) {
if(!strcasecmp(optarg, "HUP"))
kill_tincd = SIGHUP;
@ -225,8 +229,7 @@ static bool parse_options(int argc, char **argv) {
case 'n': /* net name given */
/* netname "." is special: a "top-level name" */
netname = strcmp(optarg, ".") != 0 ?
xstrdup(optarg) : NULL;
netname = strcmp(optarg, ".") != 0 ? xstrdup(optarg) : NULL;
break;
case 'o': /* option */
@ -237,6 +240,8 @@ static bool parse_options(int argc, char **argv) {
break;
case 'K': /* generate public/private keypair */
if(!optarg && optind < argc && *argv[optind] != '-')
optarg = argv[optind++];
if(optarg) {
generate_keys = atoi(optarg);
@ -274,6 +279,8 @@ static bool parse_options(int argc, char **argv) {
case 4: /* write log entries to a file */
use_logfile = true;
if(!optarg && optind < argc && *argv[optind] != '-')
optarg = argv[optind++];
if(optarg)
logfilename = xstrdup(optarg);
break;
@ -291,6 +298,12 @@ static bool parse_options(int argc, char **argv) {
}
}
if(optind < argc) {
fprintf(stderr, "%s: unrecognized argument '%s'\n", argv[0], argv[optind]);
usage(true);
return false;
}
return true;
}