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

Don't modify $usev6 to avoid misleading log messages

Browse source
This commit is contained in:
Richard Hansen 2024-03-15 15:02:42 -07:00
parent 01d1d5e142
commit 57f15bcb97
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ddclient.in
View file

@ -3281,9 +3281,7 @@ sub get_ipv6 {
## Static IPv6 address is provided in "ipv6=<address>" ## Static IPv6 address is provided in "ipv6=<address>"
if ($usev6 eq 'ip') { if ($usev6 eq 'ip') {
warning("'--usev6=ip' is deprecated. Use '--usev6=ipv6'"); warning("'--usev6=ip' is deprecated. Use '--usev6=ipv6'");
$usev6 = 'ipv6'; $arg = opt('ipv6', $h) // $arg;
## If there is a value for ipv6= use that, else use value for ip=
$arg = opt($usev6, $h) // $arg;
} }
$ipv6 = $arg; $ipv6 = $arg;
if (!is_ipv6($ipv6)) { if (!is_ipv6($ipv6)) {
@ -3296,9 +3294,7 @@ sub get_ipv6 {
## Obtain IPv6 address from interface mamed in "ifv6=<if>" ## Obtain IPv6 address from interface mamed in "ifv6=<if>"
if ($usev6 eq 'if') { if ($usev6 eq 'if') {
warning("'--usev6=if' is deprecated. Use '--usev6=ifv6'"); warning("'--usev6=if' is deprecated. Use '--usev6=ifv6'");
$usev6 = 'ifv6'; $arg = opt('ifv6', $h) // $arg;
## If there is a value for ifv6= use that, else use value for if=
$arg = opt($usev6, $h) // $arg;
} }
warning("'--if-skip' is deprecated and does nothing for IPv6") if (opt('verbose') && opt('if-skip', $h)); warning("'--if-skip' is deprecated and does nothing for IPv6") if (opt('verbose') && opt('if-skip', $h));
$ipv6 = get_ip_from_interface($arg,6); $ipv6 = get_ip_from_interface($arg,6);
@ -3307,9 +3303,7 @@ sub get_ipv6 {
## Obtain IPv6 address by executing the command in "cmdv6=<command>" ## Obtain IPv6 address by executing the command in "cmdv6=<command>"
if ($usev6 eq 'cmd') { if ($usev6 eq 'cmd') {
warning("'--usev6=cmd' is deprecated. Use '--usev6=cmdv6'"); warning("'--usev6=cmd' is deprecated. Use '--usev6=cmdv6'");
$usev6 = 'cmdv6'; $arg = opt('cmdv6', $h) // $arg;
## If there is a value for cmdv6= use that, else use value for cmd=
$arg = opt($usev6, $h) // $arg;
} }
warning("'--cmd-skip' is deprecated and does nothing for IPv6") if (opt('verbose') && opt('cmd-skip', $h)); warning("'--cmd-skip' is deprecated and does nothing for IPv6") if (opt('verbose') && opt('cmd-skip', $h));
if ($arg) { if ($arg) {
@ -3322,9 +3316,7 @@ sub get_ipv6 {
## Obtain IPv6 address by accessing website at url in "webv6=<url>" ## Obtain IPv6 address by accessing website at url in "webv6=<url>"
if ($usev6 eq 'web') { if ($usev6 eq 'web') {
warning("'--usev6=web' is deprecated. Use '--usev6=webv6'"); warning("'--usev6=web' is deprecated. Use '--usev6=webv6'");
$usev6 = 'webv6'; $arg = opt('webv6', $h) // $arg;
## If there is a value for webv6= use that, else use value for web=
$arg = opt($usev6, $h) // $arg;
} }
warning("'--web-skip' does nothing for IPv6. Use '--webv6-skip'") if (opt('web-skip', $h)); warning("'--web-skip' does nothing for IPv6. Use '--webv6-skip'") if (opt('web-skip', $h));
$url = $arg; $url = $arg;
@ -3369,7 +3361,7 @@ sub get_ipv6 {
## If $ipv6 not set yet look for IPv6 address in the $reply text ## If $ipv6 not set yet look for IPv6 address in the $reply text
$ipv6 //= extract_ipv6($reply); $ipv6 //= extract_ipv6($reply);
## Return undef for loopback address unless statically assigned by "ipv6=::" ## Return undef for loopback address unless statically assigned by "ipv6=::"
$ipv6 = undef if (($usev6 ne 'ipv6') && (($ipv6 // '') eq '::')); $ipv6 = undef if (($usev6 ne 'ipv6') && ($usev6 ne 'ip') && (($ipv6 // '') eq '::'));
debug("get_ipv6: using (%s, %s) reports %s", $usev6, $arg, $ipv6 // "<undefined>"); debug("get_ipv6: using (%s, %s) reports %s", $usev6, $arg, $ipv6 // "<undefined>");
return $ipv6; return $ipv6;
} }