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

Merge pull request #169 from rhansen/geturl-force-ip-version

Browse source
This commit is contained in:
Sandro 2020-06-24 15:15:12 +02:00 committed by GitHub
commit 271f277126
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 176 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

239
ddclient
View file

@ -1521,7 +1521,12 @@ sub test_possible_ip {
sub test_geturl { sub test_geturl {
my $url = shift; my $url = shift;
my $reply = geturl(opt('proxy'), $url, opt('login'), opt('password')); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => opt('login'),
password => opt('password'),
});
print "URL $url\n"; print "URL $url\n";
print defined($reply) ? $reply : "<undefined>\n"; print defined($reply) ? $reply : "<undefined>\n";
exit; exit;
@ -1995,13 +2000,15 @@ EOM
## geturl ## geturl
###################################################################### ######################################################################
sub geturl { sub geturl {
my $proxy = shift || ''; my ($params) = @_;
my $url = shift || ''; my $proxy = $params->{proxy} // '';
my $login = shift || ''; my $url = $params->{url} // '';
my $password = shift || ''; my $login = $params->{login} // '';
my $headers = shift || ''; my $password = $params->{password} // '';
my $method = shift || 'GET'; my $ipversion = $params->{ipversion} // '';
my $data = shift || ''; my $headers = $params->{headers} // '';
my $method = $params->{method} // 'GET';
my $data = $params->{data} // '';
my ($peer, $server, $port, $default_port, $use_ssl); my ($peer, $server, $port, $default_port, $use_ssl);
my ($sd, $request, $reply); my ($sd, $request, $reply);
@ -2021,7 +2028,6 @@ sub geturl {
if ($force_ssl || ($globals{'ssl'} and (caller(1))[3] ne 'main::get_ip')) { if ($force_ssl || ($globals{'ssl'} and (caller(1))[3] ne 'main::get_ip')) {
$use_ssl = 1; $use_ssl = 1;
$default_port = 443; $default_port = 443;
load_ssl_support;
} else { } else {
$use_ssl = 0; $use_ssl = 0;
$default_port = 80; $default_port = 80;
@ -2030,6 +2036,7 @@ sub geturl {
debug("protocol = %s", $use_ssl ? "https" : "http"); debug("protocol = %s", $use_ssl ? "https" : "http");
debug("server = %s", $server); debug("server = %s", $server);
debug("url = %s", $url); debug("url = %s", $url);
debug("ip ver = %s", $ipversion);
## determine peer and port to use. ## determine peer and port to use.
$peer = $proxy || $server; $peer = $proxy || $server;
@ -2039,9 +2046,6 @@ sub geturl {
$port = $default_port unless $port =~ /^\d+$/; $port = $default_port unless $port =~ /^\d+$/;
$peer =~ s%:.*$%%; $peer =~ s%:.*$%%;
my $to = sprintf "%s%s", $server, $proxy ? " via proxy $peer:$port" : "";
verbose("CONNECT:", "%s", $to);
$request = "$method "; $request = "$method ";
if (!$use_ssl) { if (!$use_ssl) {
$request .= "http://$server" if $proxy; $request .= "http://$server" if $proxy;
@ -2067,57 +2071,61 @@ sub geturl {
$request .= $data; $request .= $data;
$rq .= $data; $rq .= $data;
my $socket_class = 'IO::Socket::INET';
$0 = sprintf("%s - connecting to %s port %s", $program, $peer, $port); if ($use_ssl) {
if (!opt('exec')) { # IO::Socket::SSL will load IPv6 support if available on the system.
debug("skipped network connection"); load_ssl_support;
verbose("SENDING:", "%s", $request); $socket_class = 'IO::Socket::SSL';
} elsif ($use_ssl) { } elsif ($globals{'ipv6'} || $ipversion eq '6') {
$sd = IO::Socket::SSL->new(
PeerAddr => $peer,
PeerPort => $port,
Proto => 'tcp',
MultiHomed => 1,
Timeout => opt('timeout'),
);
defined $sd or warning("cannot connect to %s:%s socket: %s %s", $peer, $port, $@, IO::Socket::SSL::errstr());
} elsif ($globals{'ipv6'}) {
load_ipv6_support; load_ipv6_support;
$sd = IO::Socket::INET6->new( $socket_class = 'IO::Socket::INET6';
}
my %socket_args = (
PeerAddr => $peer, PeerAddr => $peer,
PeerPort => $port, PeerPort => $port,
Proto => 'tcp', Proto => 'tcp',
MultiHomed => 1, MultiHomed => 1,
Timeout => opt('timeout'), Timeout => opt('timeout'),
); );
defined $sd or warning("cannot connect to %s:%s socket: %s", $peer, $port, $@); if ($ipversion eq '4') {
} else { $socket_args{Domain} = PF_INET;
$sd = IO::Socket::INET->new( $socket_args{Family} = AF_INET;
PeerAddr => $peer, } elsif ($ipversion eq '6') {
PeerPort => $port, $socket_args{Domain} = PF_INET6;
Proto => 'tcp', $socket_args{Family} = AF_INET6;
MultiHomed => 1, } elsif ($ipversion ne '') {
Timeout => opt('timeout'), fatal("geturl passed unsupported 'ipversion' value %s", $ipversion);
);
defined $sd or warning("cannot connect to %s:%s socket: %s", $peer, $port, $@);
} }
my $ipv = $ipversion eq '' ? '' : sprintf(" (IPv%s)", $ipversion);
my $peer_port_ipv = sprintf("%s:%s%s", $peer, $port, $ipv);
my $to = sprintf("%s%s%s", $server, $proxy ? " via proxy $peer:$port" : "", $ipv);
verbose("CONNECT:", "%s", $to);
$0 = sprintf("%s - connecting to %s", $program, $peer_port_ipv);
if (opt('exec')) {
$sd = $socket_class->new(%socket_args);
defined($sd) or warning("cannot connect to %s socket: %s%s", $peer_port_ipv, $@,
$use_ssl ? ' ' . IO::Socket::SSL::errstr() : '');
} else {
debug("skipped network connection");
verbose("SENDING:", "%s", $request);
}
if (defined $sd) { if (defined $sd) {
## send the request to the http server ## send the request to the http server
verbose("CONNECTED: ", $use_ssl ? 'using SSL' : 'using HTTP'); verbose("CONNECTED: ", $use_ssl ? 'using SSL' : 'using HTTP');
verbose("SENDING:", "%s", $request); verbose("SENDING:", "%s", $request);
$0 = sprintf("%s - sending to %s port %s", $program, $peer, $port); $0 = sprintf("%s - sending to %s", $program, $peer_port_ipv);
my $result = syswrite $sd, $rq; my $result = syswrite $sd, $rq;
if ($result != length($rq)) { if ($result != length($rq)) {
warning("cannot send to %s:%s (%s).", $peer, $port, $!); warning("cannot send to %s (%s).", $peer_port_ipv, $!);
} else { } else {
$0 = sprintf("%s - reading from %s port %s", $program, $peer, $port); $0 = sprintf("%s - reading from %s", $program, $peer_port_ipv);
eval { eval {
local $SIG{'ALRM'} = sub { die "timeout"; }; local $SIG{'ALRM'} = sub { die "timeout"; };
alarm(opt('timeout')) if opt('timeout') > 0; alarm(opt('timeout')) if opt('timeout') > 0;
while ($_ = <$sd>) { while ($_ = <$sd>) {
$0 = sprintf("%s - read from %s port %s", $program, $peer, $port); $0 = sprintf("%s - read from %s", $program, $peer_port_ipv);
verbose("RECEIVE:", "%s", define($_, "<undefined>")); verbose("RECEIVE:", "%s", define($_, "<undefined>"));
$reply .= $_ if defined $_; $reply .= $_ if defined $_;
} }
@ -2134,7 +2142,7 @@ sub geturl {
$reply = '' if !defined $reply; $reply = '' if !defined $reply;
} }
} }
$0 = sprintf("%s - closed %s port %s", $program, $peer, $port); $0 = sprintf("%s - closed %s", $program, $peer_port_ipv);
## during testing simulate reading the URL ## during testing simulate reading the URL
if (opt('test')) { if (opt('test')) {
@ -2229,7 +2237,7 @@ sub get_ip {
$arg = $url; $arg = $url;
if ($url) { if ($url) {
$reply = geturl(opt('proxy', $h), $url) || ''; $reply = geturl({ proxy => opt('proxy', $h), url => $url }) || '';
} }
} elsif (($use eq 'cisco')) { } elsif (($use eq 'cisco')) {
@ -2246,7 +2254,11 @@ sub get_ip {
$queryif =~ s/([\?&= ])/sprintf("%%%02x", ord($1))/ge; $queryif =~ s/([\?&= ])/sprintf("%%%02x", ord($1))/ge;
$url = "http://" . opt('fw', $h) . "/level/1/exec/show/ip/interface/brief/${queryif}/CR"; $url = "http://" . opt('fw', $h) . "/level/1/exec/show/ip/interface/brief/${queryif}/CR";
$reply = geturl('', $url, opt('fw-login', $h), opt('fw-password', $h)) || ''; $reply = geturl({
url => $url,
login => opt('fw-login', $h),
password => opt('fw-password', $h),
}) || '';
$arg = $url; $arg = $url;
} elsif (($use eq 'cisco-asa')) { } elsif (($use eq 'cisco-asa')) {
@ -2263,7 +2275,11 @@ sub get_ip {
$queryif =~ s/([\?&= ])/sprintf("%%%02x", ord($1))/ge; $queryif =~ s/([\?&= ])/sprintf("%%%02x", ord($1))/ge;
$url = "https://" . opt('fw', $h) . "/exec/show%20interface%20${queryif}"; $url = "https://" . opt('fw', $h) . "/exec/show%20interface%20${queryif}";
$reply = geturl('', $url, opt('fw-login', $h), opt('fw-password', $h)) || ''; $reply = geturl({
url => $url,
login => opt('fw-login', $h),
password => opt('fw-password', $h),
}) || '';
$arg = $url; $arg = $url;
} else { } else {
@ -2277,7 +2293,11 @@ sub get_ip {
$arg = $url; $arg = $url;
if ($url) { if ($url) {
$reply = geturl('', $url, opt('fw-login', $h), opt('fw-password', $h)) || ''; $reply = geturl({
url => $url,
login => opt('fw-login', $h),
password => opt('fw-password', $h),
}) || '';
} }
} }
if (!defined $reply) { if (!defined $reply) {
@ -2656,7 +2676,12 @@ sub nic_dyndns1_update {
$url .= "&backmx=" . ynu($config{$h}{'backupmx'}, 'YES', 'NO'); $url .= "&backmx=" . ynu($config{$h}{'backupmx'}, 'YES', 'NO');
} }
my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'});
next; next;
@ -2819,7 +2844,12 @@ sub nic_dyndns2_update {
$url .= "&backmx=" . ynu($config{$h}{'backupmx'}, 'YES', 'NO'); $url .= "&backmx=" . ynu($config{$h}{'backupmx'}, 'YES', 'NO');
} }
my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $hosts, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $hosts, $config{$h}{'server'});
last; last;
@ -2924,7 +2954,12 @@ sub nic_noip_update {
$url .= "&myip="; $url .= "&myip=";
$url .= $ip if $ip; $url .= $ip if $ip;
my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $hosts, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $hosts, $config{$h}{'server'});
last; last;
@ -3059,7 +3094,12 @@ sub nic_dslreports1_update {
$url .= "&myip="; $url .= "&myip=";
$url .= $ip if $ip; $url .= $ip if $ip;
my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'});
next; next;
@ -3134,7 +3174,12 @@ sub nic_hammernode1_update {
$url .= "&ip="; $url .= "&ip=";
$url .= $ip if $ip; $url .= $ip if $ip;
my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'});
last; last;
@ -3224,7 +3269,12 @@ sub nic_zoneedit1_update {
$url .= "&dnsto=$ip" if $ip; $url .= "&dnsto=$ip" if $ip;
$url .= "&zone=$config{$h}{'zone'}" if defined $config{$h}{'zone'}; $url .= "&zone=$config{$h}{'zone'}" if defined $config{$h}{'zone'};
my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $hosts, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $hosts, $config{$h}{'server'});
last; last;
@ -3374,7 +3424,12 @@ sub nic_easydns_update {
$url .= "&backmx=" . ynu($config{$h}{'backupmx'}, 'YES', 'NO'); $url .= "&backmx=" . ynu($config{$h}{'backupmx'}, 'YES', 'NO');
} }
my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $hosts, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $hosts, $config{$h}{'server'});
last; last;
@ -3488,7 +3543,7 @@ sub nic_namecheap_update {
$url .= "&ip="; $url .= "&ip=";
$url .= $ip if $ip; $url .= $ip if $ip;
my $reply = geturl(opt('proxy'), $url); my $reply = geturl({ proxy => opt('proxy'), url => $url });
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'});
last; last;
@ -3619,7 +3674,13 @@ sub nic_nfsn_make_request {
$header .= "Content-Type: application/x-www-form-urlencoded\n"; $header .= "Content-Type: application/x-www-form-urlencoded\n";
} }
return geturl(opt('proxy'), $url, '', '', $header, $method, $body); return geturl({
proxy => opt('proxy'),
url => $url,
headers => $header,
method => $method,
data => $body,
});
} }
###################################################################### ######################################################################
@ -3792,7 +3853,7 @@ sub nic_sitelutions_update {
$url .= "&ip="; $url .= "&ip=";
$url .= $ip if $ip; $url .= $ip if $ip;
my $reply = geturl(opt('proxy'), $url); my $reply = geturl({ proxy => opt('proxy'), url => $url });
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'});
last; last;
@ -3863,7 +3924,7 @@ sub nic_freedns_update {
## First get the list of updatable hosts ## First get the list of updatable hosts
my $url; my $url;
$url = "http://$config{$_[0]}{'server'}/api/?action=getdyndns&sha=" . &sha1_hex("$config{$_[0]}{'login'}|$config{$_[0]}{'password'}"); $url = "http://$config{$_[0]}{'server'}/api/?action=getdyndns&sha=" . &sha1_hex("$config{$_[0]}{'login'}|$config{$_[0]}{'password'}");
my $reply = geturl(opt('proxy'), $url); my $reply = geturl({ proxy => opt('proxy'), url => $url });
if (!defined($reply) || !$reply || !header_ok($_[0], $reply)) { if (!defined($reply) || !$reply || !header_ok($_[0], $reply)) {
failed("updating %s: Could not connect to %s for site list.", $_[0], $url); failed("updating %s: Could not connect to %s for site list.", $_[0], $url);
return; return;
@ -3891,7 +3952,7 @@ sub nic_freedns_update {
$config{$h}{'status'} = 'good'; $config{$h}{'status'} = 'good';
success("update not necessary %s: good: IP address already set to %s", $h, $ip); success("update not necessary %s: good: IP address already set to %s", $h, $ip);
} else { } else {
my $reply = geturl(opt('proxy'), $freedns_hosts{$h}->[2]); my $reply = geturl({proxy => opt('proxy'), url => $freedns_hosts{$h}->[2] });
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $freedns_hosts{$h}->[2]); failed("updating %s: Could not connect to %s.", $h, $freedns_hosts{$h}->[2]);
last; last;
@ -3968,7 +4029,12 @@ sub nic_changeip_update {
$url .= "&ip="; $url .= "&ip=";
$url .= $ip if $ip; $url .= $ip if $ip;
my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'});
last; last;
@ -4044,7 +4110,7 @@ sub nic_dtdns_update {
$url .= $config{$h}{'client'}; $url .= $config{$h}{'client'};
# Try to get URL # Try to get URL
my $reply = geturl(opt('proxy'), $url); my $reply = geturl({ proxy => opt('proxy'), url => $url });
# No response, declare as failed # No response, declare as failed
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
@ -4129,7 +4195,12 @@ sub nic_googledomains_update {
$url .= "&myip="; $url .= "&myip=";
$url .= $ip if $ip; $url .= $ip if $ip;
my $reply = geturl(opt('proxy'), $url, $config{$host}{'login'}, $config{$host}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$host}{'login'},
password => $config{$host}{'password'},
});
unless ($reply) { unless ($reply) {
failed("updating %s: Could not connect to %s.", $host, $config{$host}{'server'}); failed("updating %s: Could not connect to %s.", $host, $config{$host}{'server'});
last; last;
@ -4338,7 +4409,7 @@ sub nic_cloudflare_update {
my $url = "https://$config{$key}{'server'}/zones?"; my $url = "https://$config{$key}{'server'}/zones?";
$url .= "name=".$config{$key}{'zone'}; $url .= "name=".$config{$key}{'zone'};
my $reply = geturl(opt('proxy'), $url, undef, undef, $headers); my $reply = geturl({ proxy => opt('proxy'), url => $url, headers => $headers });
unless ($reply) { unless ($reply) {
failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'}); failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'});
last; last;
@ -4369,7 +4440,7 @@ sub nic_cloudflare_update {
$url .= "type=A&name=$domain"; $url .= "type=A&name=$domain";
} }
$reply = geturl(opt('proxy'), $url, undef, undef, $headers); $reply = geturl({ proxy => opt('proxy'), url => $url, headers => $headers });
unless ($reply) { unless ($reply) {
failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'}); failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'});
last; last;
@ -4395,7 +4466,13 @@ sub nic_cloudflare_update {
# Set domain # Set domain
$url = "https://$config{$key}{'server'}/zones/$zone_id/dns_records/$dns_rec_id"; $url = "https://$config{$key}{'server'}/zones/$zone_id/dns_records/$dns_rec_id";
my $data = "{\"content\":\"$ip\"}"; my $data = "{\"content\":\"$ip\"}";
$reply = geturl(opt('proxy'), $url, undef, undef, $headers, "PATCH", $data); $reply = geturl({
proxy => opt('proxy'),
url => $url,
headers => $headers,
method => "PATCH",
data => $data,
});
unless ($reply) { unless ($reply) {
failed("updating %s: Could not connect to %s.", $domain, $config{$domain}{'server'}); failed("updating %s: Could not connect to %s.", $domain, $config{$domain}{'server'});
last; last;
@ -4479,7 +4556,7 @@ sub nic_yandex_update {
my $url = "https://$config{$host}{'server'}/api2/admin/dns/list?"; my $url = "https://$config{$host}{'server'}/api2/admin/dns/list?";
$url .= "domain="; $url .= "domain=";
$url .= $config{$key}{'login'}; $url .= $config{$key}{'login'};
my $reply = geturl(opt('proxy'), $url, '', '', $headers); my $reply = geturl({ proxy => opt('proxy'), url => $url, headers => $headers });
unless ($reply) { unless ($reply) {
failed("updating %s: Could not connect to %s.", $host, $config{$key}{'server'}); failed("updating %s: Could not connect to %s.", $host, $config{$key}{'server'});
last; last;
@ -4510,7 +4587,13 @@ sub nic_yandex_update {
$data .= "&content="; $data .= "&content=";
$data .= $ip if $ip; $data .= $ip if $ip;
$reply = geturl(opt('proxy'), $url, '', '', $headers, 'POST', $data); $reply = geturl({
proxy => opt('proxy'),
url => $url,
headers => $headers,
method => 'POST',
data => $data,
});
unless ($reply) { unless ($reply) {
failed("updating %s: Could not connect to %s.", $host, $config{$host}{'server'}); failed("updating %s: Could not connect to %s.", $host, $config{$host}{'server'});
last; last;
@ -4588,7 +4671,7 @@ sub nic_duckdns_update {
# Try to get URL # Try to get URL
my $reply = geturl(opt('proxy'), $url); my $reply = geturl({ proxy => opt('proxy'), url => $url });
# No response, declare as failed # No response, declare as failed
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
@ -4659,7 +4742,7 @@ sub nic_freemyip_update {
$url .= $h; $url .= $h;
# Try to get URL # Try to get URL
my $reply = geturl(opt('proxy'), $url); my $reply = geturl({ proxy => opt('proxy'), url => $url });
# No response, declare as failed # No response, declare as failed
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
@ -4787,7 +4870,12 @@ sub nic_woima_update {
$url .= "&backmx=" . ynu($config{$h}{'backupmx'}, 'YES', 'NO'); $url .= "&backmx=" . ynu($config{$h}{'backupmx'}, 'YES', 'NO');
} }
my $reply = geturl(opt('proxy'), $url, $config{$h}{'login'}, $config{$h}{'password'}); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'});
last; last;
@ -4903,7 +4991,7 @@ sub nic_dondominio_update {
# Try to get URL # Try to get URL
my $reply = geturl(opt('proxy'), $url); my $reply = geturl({ proxy => opt('proxy'), url => $url });
# No response, declare as failed # No response, declare as failed
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
@ -4989,7 +5077,7 @@ sub nic_dnsmadeeasy_update {
$url .= "&id=$h"; $url .= "&id=$h";
# Try to get URL # Try to get URL
my $reply = geturl(opt('proxy'), $url); my $reply = geturl({ proxy => opt('proxy'), url => $url });
# No response, declare as failed # No response, declare as failed
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
@ -5060,7 +5148,12 @@ sub nic_ovh_update {
$url .= "&myip="; $url .= "&myip=";
$url .= $ip if $ip; $url .= $ip if $ip;
my $reply = geturl(opt('proxy'), $url, "$config{$h}{'login'}", "$config{$h}{'password'}"); my $reply = geturl({
proxy => opt('proxy'),
url => $url,
login => $config{$h}{'login'},
password => $config{$h}{'password'},
});
if (!defined($reply) || !$reply) { if (!defined($reply) || !$reply) {
failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'}); failed("updating %s: Could not connect to %s.", $h, $config{$h}{'server'});