From 7f265ce9981cd6a1e71bd676dadb3f8f508f1363 Mon Sep 17 00:00:00 2001
From: root <root@lamia.panaceas.james.local>
Date: Wed, 30 Aug 2017 09:44:35 +0100
Subject: tidy and proxy support for ILO2

---
 INF/DSRx020.pm | 46 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

(limited to 'INF/DSRx020.pm')

diff --git a/INF/DSRx020.pm b/INF/DSRx020.pm
index fad319c..cc87097 100644
--- a/INF/DSRx020.pm
+++ b/INF/DSRx020.pm
@@ -478,13 +478,31 @@ sub view($$) {
 
 #print join( ' ', ( "java", "-cp", $cp, "com.avocent.video.Stingray", @$args ) ), "\n";
 
-   if ($self->{proxy_host}) {
-    system( "echo","java", "-DsocksProxyHost=".$self->{proxy_host},"-DsocksProxyPort=".$self->{proxy_port},"-cp", $cp, "com.avocent.video.Stingray", @$args );
-    system( "java", "-DsocksProxyHost=".$self->{proxy_host},"-DsocksProxyPort=".$self->{proxy_port},"-cp", $cp, "com.avocent.video.Stingray", @$args );
+    if ( $self->{proxy_host} ) {
+        system(
+            "echo",
+            "java",
+            "-DsocksProxyHost=" . $self->{proxy_host},
+            "-DsocksProxyPort=" . $self->{proxy_port},
+            "-cp",
+            $cp,
+            "com.avocent.video.Stingray",
+            @$args
+        );
+        system(
+            "java",
+            "-DsocksProxyHost=" . $self->{proxy_host},
+            "-DsocksProxyPort=" . $self->{proxy_port},
+            "-cp",
+            $cp,
+            "com.avocent.video.Stingray",
+            @$args
+        );
 
-  } else {
-    system( "java", "-cp", $cp, "com.avocent.video.Stingray", @$args );
-   }
+    }
+    else {
+        system( "java", "-cp", $cp, "com.avocent.video.Stingray", @$args );
+    }
 
 }
 
@@ -603,6 +621,10 @@ sub name_set($$) {
     return 0;
 }
 
+sub logout($) {
+    my $self = shift;
+}
+
 sub new ($;$) {
     my ( $class, $parm ) = @_;
     my $self;
@@ -611,10 +633,14 @@ sub new ($;$) {
 
     $self->{host} = $parm->{host} || "127.0.0.1";
 
-    if (defined $parm->{proxy_host}) { 
-    $self->{ua}->proxy([qw(http https)] => "socks://".$parm->{proxy_host}.":".$parm->{proxy_port});
-    $self->{proxy_host}= $parm->{proxy_host};
-    $self->{proxy_port}= $parm->{proxy_port};
+    if ( defined $parm->{proxy_host} ) {
+
+        $self->{ua}->proxy( [qw(http https)] => "socks://"
+              . $parm->{proxy_host} . ":"
+              . $parm->{proxy_port} );
+
+        $self->{proxy_host} = $parm->{proxy_host};
+        $self->{proxy_port} = $parm->{proxy_port};
     }
 
     $self->{user}     = $parm->{user}     || "Admin";
-- 
cgit v1.2.3