Show original user input in debug message

Also add comments explaining the purpose of the lines, because it's
not immediately clear.
This commit is contained in:
Richard Hansen 2024-05-05 17:48:44 -04:00
parent b7dd590300
commit d525e28c20

View file

@ -2803,14 +2803,15 @@ sub get_ip {
$reply = ''; $reply = '';
} else { } else {
$url = opt('fw', $h) // ''; # Note that --use=firewallname uses --fw=arg, not --firewallname=arg.
$arg = opt('fw', $h) // '';
$url = $arg;
$skip = opt('fw-skip', $h) // ''; $skip = opt('fw-skip', $h) // '';
if (exists $builtinfw{$use}) { if (exists $builtinfw{$use}) {
$skip = $builtinfw{$use}->{'skip'} unless $skip; $skip = $builtinfw{$use}->{'skip'} unless $skip;
$url = "http://${url}" . $builtinfw{$use}->{'url'} unless $url =~ /\//; $url = "http://${url}" . $builtinfw{$use}->{'url'} unless $url =~ /\//;
} }
$arg = $url;
if ($url) { if ($url) {
$reply = geturl( $reply = geturl(
@ -3234,14 +3235,15 @@ sub get_ipv4 {
if (!defined(opt('fwv4', $h)) && defined(opt('fw', $h))); if (!defined(opt('fwv4', $h)) && defined(opt('fw', $h)));
warning("'--fw-skip' is deprecated for '--usev4=$usev4'; use '--fwv4-skip' instead") warning("'--fw-skip' is deprecated for '--usev4=$usev4'; use '--fwv4-skip' instead")
if (!defined(opt('fwv4-skip', $h)) && defined(opt('fw-skip', $h))); if (!defined(opt('fwv4-skip', $h)) && defined(opt('fw-skip', $h)));
$url = opt('fwv4', $h) // opt('fw', $h) // ''; # Note that --usev4=firewallname uses --fwv4=arg (or --fw=arg), not --firewallname=arg.
$arg = opt('fwv4', $h) // opt('fw', $h) // '';
$url = $arg;
$skip = opt('fwv4-skip', $h) // opt('fw-skip', $h) // ''; $skip = opt('fwv4-skip', $h) // opt('fw-skip', $h) // '';
if (exists $builtinfw{$usev4}) { if (exists $builtinfw{$usev4}) {
$skip = $builtinfw{$usev4}->{'skip'} unless $skip; $skip = $builtinfw{$usev4}->{'skip'} unless $skip;
$url = "http://${url}" . $builtinfw{$usev4}->{'url'} unless $url =~ /\//; $url = "http://${url}" . $builtinfw{$usev4}->{'url'} unless $url =~ /\//;
} }
$arg = $url;
if ($url) { if ($url) {
$reply = geturl( $reply = geturl(
url => $url, url => $url,