Changeset 856

Timestamp:

Aug 14, 2018, 5:05:00 PM (6 years ago)

Author:

chronos

Message:

• Modified: Use id_rsa instead of id_dsa for airos devices.

Location:

trunk/Modules/NetworkConfigAirOS/Generators

Files:

• SSHClient.php (modified) (2 diffs)
• Signal.php (modified) (2 diffs)

trunk/Modules/NetworkConfigAirOS/Generators/SSHClient.php

@@ -17 +17 @@
     $this->Password = $Password;
     $this->Debug = false;
-    $this->PrivateKey = 'id_dsa';
+    $this->PrivateKey = '~/.ssh/id_rsa';
     $this->SSHPath = '/usr/bin/ssh';
     $this->Timeout = 3;
@@ -30 +30 @@
       $Commands = str_replace('$', '\$', $Commands);
       //$Commands = str_replace(' ', '\ ', $Commands);
-      $Command = $this->SSHPath.' -o ConnectTimeout='.$this->Timeout.' -l '.
-        $this->UserName.' -i '.$this->PrivateKey.' '.$this->HostName.' "'.$Commands.'"';
+      if ($this->PrivateKey != '') $PrivKey = ' -i '.$this->PrivateKey;
+        else $PrivKey = '';
+      $Command = $this->SSHPath.' -oBatchMode=yes -o ConnectTimeout='.$this->Timeout.' -l '.
+        $this->UserName.$PrivKey.' '.$this->HostName.' "'.$Commands.'"';
       if($this->Debug) echo($Command);
       $Output = array();

trunk/Modules/NetworkConfigAirOS/Generators/Signal.php

@@ -15 +15 @@
     while($Device = $DbResult3->fetch_assoc())
     {
-      echo($Device['LocalIP']."\n");
+      echo($Device['LocalIP']."");
       $SSHClient = new SSHClient($Device['LocalIP'], $Device['LoginName'], $Device['LoginPassword']);
+      //$SSHClient->Debug = true;
       $Result = $SSHClient->Execute('wstalist');
-      print_r($Result);
+      if (count($Result) > 0) 
+      {      
+      //print_r($Result);
       $Array = json_decode(implode("\n", $Result), true);
-      print_r($Array);
+      //print_r($Array);
+      echo('-');
       foreach($Array as $Properties)
       {
@@ -36 +40 @@
           'Value' => $Strength, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
           'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface, 'Device' => $Device['Id']));
+        echo('.');
       }
+      echo("\n");
+      } else echo("Empty response\n");
+      
     }
   }