Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #665 from rhansen/usage

Browse source 
Enable `--use=disabled`; more `--help` usage improvements
This commit is contained in:
Richard Hansen 2024-05-13 19:24:50 -04:00 committed by GitHub
commit 8ac575125b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ddclient.in
View file

@ -428,24 +428,26 @@ our %builtinfw = (
); );
my %ip_strategies = ( my %ip_strategies = (
'no' => ": deprecated, see '--usev4' and '--usev6'", 'disabled' => ": do not use a deprecated method to obtain an IP address for this host",
'ip' => ": deprecated, see '--usev4' and '--usev6'", 'no' => ": deprecated, see '--use=disabled'",
'web' => ": deprecated, see '--usev4' and '--usev6'", 'ip' => ": deprecated, see '--usev4=ipv4' and '--usev6=ipv6'",
'fw' => ": deprecated, see '--usev4' and '--usev6'", 'web' => ": deprecated, see '--usev4=webv4' and '--usev6=webv6'",
'if' => ": deprecated, see '--usev4' and '--usev6'", 'fw' => ": deprecated, see '--usev4=fwv4' and '--usev6=fwv6'",
'cmd' => ": deprecated, see '--usev4' and '--usev6'", 'if' => ": deprecated, see '--usev4=ifv4' and '--usev6=ifv6'",
'cisco' => ": deprecated, see '--usev4' and '--usev6'", 'cmd' => ": deprecated, see '--usev4=cmdv4' and '--usev6=cmdv6'",
'cisco-asa' => ": deprecated, see '--usev4' and '--usev6'", 'cisco' => ": deprecated, see '--usev4=cisco'",
map({ $_ => ": deprecated, see '--usev4' and '--usev6'"; } keys(%builtinfw)), 'cisco-asa' => ": deprecated, see '--usev4=cisco-asa'",
map({ $_ => ": deprecated, see '--usev4=$_'"; } keys(%builtinfw)),
); );
sub ip_strategies_usage { sub ip_strategies_usage {
return map({ sprintf(" --use=%-22s %s.", $_, $ip_strategies{$_}) } return map({ sprintf(" --use=%-22s %s.", $_, $ip_strategies{$_}) }
('ip', 'web', 'if', 'cmd', 'fw', sort('cisco', 'cisco-asa', keys(%builtinfw)))); 'disabled', 'no', 'ip', 'web', 'if', 'cmd', 'fw',
sort('cisco', 'cisco-asa', keys(%builtinfw)));
} }
my %ipv4_strategies = ( my %ipv4_strategies = (
'disabled' => ": do not obtain an IPv4 address for this host", 'disabled' => ": do not obtain an IPv4 address for this host (except possibly via the deprecated '--use' option, if it is enabled)",
'ipv4' => ": obtain IPv4 from the address given by --ipv4=<address>", 'ipv4' => ": obtain IPv4 from the address given by --ipv4=<address>",
'webv4' => ": obtain IPv4 from an IP discovery page on the web", 'webv4' => ": obtain IPv4 from an IP discovery page on the web",
'ifv4' => ": obtain IPv4 from the interface given by --ifv4=<interface>", 'ifv4' => ": obtain IPv4 from the interface given by --ifv4=<interface>",
@ -457,24 +459,27 @@ my %ipv4_strategies = (
} keys(%builtinfw)), } keys(%builtinfw)),
); );
sub ipv4_strategies_usage { sub ipv4_strategies_usage {
return map { sprintf(" --usev4=%-22s %s.", $_, $ipv4_strategies{$_}) } sort keys %ipv4_strategies; return map({ sprintf(" --usev4=%-22s %s.", $_, $ipv4_strategies{$_}) }
'disabled', 'ipv4', 'webv4', 'ifv4', 'cmdv4', 'fwv4', sort(keys(%builtinfw)));
} }
my %ipv6_strategies = ( my %ipv6_strategies = (
'disabled' => ": do not obtain an IPv6 address for this host (except possibly via the deprecated '--use' option, if it is enabled)",
'no' => ": deprecated, use '--usev6=disabled'", 'no' => ": deprecated, use '--usev6=disabled'",
'disabled' => ": do not obtain an IPv6 address for this host",
'ip' => ": deprecated, use '--usev6=ipv6'",
'ipv6' => ": obtain IPv6 from the address given by --ipv6=<address>", 'ipv6' => ": obtain IPv6 from the address given by --ipv6=<address>",
'web' => ": deprecated, use '--usev6=webv6'", 'ip' => ": deprecated, use '--usev6=ipv6'",
'webv6' => ": obtain IPv6 from an IP discovery page on the web", 'webv6' => ": obtain IPv6 from an IP discovery page on the web",
'if' => ": deprecated, use '--usev6=ifv6'", 'web' => ": deprecated, use '--usev6=webv6'",
'ifv6' => ": obtain IPv6 from the interface given by --ifv6=<interface>", 'ifv6' => ": obtain IPv6 from the interface given by --ifv6=<interface>",
'cmd' => ": deprecated, use '--usev6=cmdv6'", 'if' => ": deprecated, use '--usev6=ifv6'",
'cmdv6' => ": obtain IPv6 from the command given by --cmdv6=<command>", 'cmdv6' => ": obtain IPv6 from the command given by --cmdv6=<command>",
'cmd' => ": deprecated, use '--usev6=cmdv6'",
'fwv6' => ": obtain IPv6 from the URL given by --fwv6=<URL>", 'fwv6' => ": obtain IPv6 from the URL given by --fwv6=<URL>",
); );
sub ipv6_strategies_usage { sub ipv6_strategies_usage {
return map { sprintf(" --usev6=%-22s %s.", $_, $ipv6_strategies{$_}) } sort keys %ipv6_strategies; return map({ sprintf(" --usev6=%-22s %s.", $_, $ipv6_strategies{$_}) }
'disabled', 'no', 'ipv6', 'ip', 'webv6', 'web', 'ifv6', 'if', 'cmdv6', 'cmd',
'fwv6');
} }
sub setv { sub setv {
@ -1109,7 +1114,7 @@ my @opt = (
["cache", "=s", "--cache=<path> : record address used in <path>"], ["cache", "=s", "--cache=<path> : record address used in <path>"],
["pid", "=s", "--pid=<path> : record process id in <path> if daemonized"], ["pid", "=s", "--pid=<path> : record process id in <path> if daemonized"],
"", "",
["use", "=s", "--use=<which> : deprecated, see '--usev4' and '--usev6'"], ["use", "=s", "--use=<which> : deprecated, see '--usev4' and '--usev6' (forced to 'disabled' if either '--usev4' or '--usev6' is enabled)"],
&ip_strategies_usage(), &ip_strategies_usage(),
["usev4", "=s", "--usev4=<which> : how the IPv4 address should be obtained"], ["usev4", "=s", "--usev4=<which> : how the IPv4 address should be obtained"],
&ipv4_strategies_usage(), &ipv4_strategies_usage(),