From 7b724b4787d925423cc09ffcccd61540b88aed8c Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Tue, 13 Jan 2015 11:25:39 +0100
Subject: [PATCH] presun funkce c2s na globalni promenne
---
src/warden-client/lib/WardenClientCommon.pm | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/warden-client/lib/WardenClientCommon.pm b/src/warden-client/lib/WardenClientCommon.pm
index 9f0561b..4aa4c97 100755
--- a/src/warden-client/lib/WardenClientCommon.pm
+++ b/src/warden-client/lib/WardenClientCommon.pm
@@ -57,7 +57,6 @@ sub errMsg
} else {
return;
}
-
} # End of errMsg
@@ -66,15 +65,11 @@ sub errMsg
#-------------------------------------------------------------------------------
sub c2s
{
- my $uri = shift;
- my $ssl_key = shift;
- my $ssl_cert = shift;
- my $ssl_ca_cert = shift;
my $method = shift;
my $data = shift;
my $client;
- my ($server, $port, $service) = $uri =~ /https:\/\/(.+)\:(\d+)\/(.+)/;
+ my ($server, $port, $service) = $WardenClientCommon::URI =~ /https:\/\/(.+)\:(\d+)\/(.+)/;
# create SOAP::Transport::HTTP:Client object
eval {
@@ -90,16 +85,16 @@ sub c2s
$client->ssl_opts(verify_hostname => 1,
SSL_use_cert => 1,
SSL_verify_mode => 0x03,
- SSL_key_file => $ssl_key,
- SSL_cert_file => $ssl_cert,
- SSL_ca_file => $ssl_ca_cert);
+ SSL_key_file => $WardenClientCommon::SSL_KEY,
+ SSL_cert_file => $WardenClientCommon::SSL_CERT,
+ SSL_ca_file => $WardenClientCommon::SSL_CA_CERT);
return 1; # fix of eval triggering 'or' statement
} or return errMsg("Ă‹rror in function 'c2s()' when setting SSL options: " . $@);
# setting of service URI
my $soap;
eval {
- $soap = SOAP::Lite->uri($service)->proxy($uri);
+ $soap = SOAP::Lite->uri($service)->proxy($WardenClientCommon::URI);
} or return errMsg("Error in function 'c2s()' when setting service URI: " . $@);
# serialize SOAP envelope or SOAP envelope and data object
--
GitLab