lib/imperituroard/platforms/iwag/iwag_telnet_connector.rb in imperituroard-1.1.17 vs lib/imperituroard/platforms/iwag/iwag_telnet_connector.rb in imperituroard-1.1.18

@@ -17,11 +17,11 @@
     subscribers_mac = ""
 
     #begin
 
       dump =""
-      connection = Net::Telnet.new( "Host" => iwag1_host, "Timeout" => false, "Prompt" => /.*\#/ ) { |str| }
+      connection = Net::Telnet.new( "Host" => iwag1_host, "Timeout" => false, "Prompt" => /.*/ ) { |str| }
       connection.login({ "Name" => iwag_username, "Password" => iwag_password, "LoginPrompt" => /Username:/ }) { |str|  }
       connection.cmd("show ip dhcp binding #{ipaddress}") {
           |c|
         p c
         dump << c
@@ -31,22 +31,22 @@
       p as
       reer = as[4].split(" ")
 
       ma = reer[1].to_s.upcase
       pos = ma[0]+ma[1]
-      if pos=="01"
+      if pos == '01'
         subscribers_mac = ma[2]+ma[3]+":"+ma[5]+ma[6]+":"+ma[7]+ma[8]+":"+ma[10]+ma[11]+":"+ma[12]+ma[13]+":"+ma[15]+ma[16]
       else
         subscribers_mac = ma[0]+ma[1]+":"+ma[2]+ma[3]+":"+ma[5]+ma[6]+":"+ma[7]+ma[8]+":"+ma[10]+ma[11]+":"+ma[12]+ma[13]
       end
 
 
     #rescue
     #  subscribers_mac = "unknown"
     #end
 
-    return subscribers_mac
+    subscribers_mac
 
   end
 
 
   #test function. Not used
@@ -67,11 +67,11 @@
     password_iwag = iwag_password
     answer =""
 
     dump =""
     begin
-      connection = Net::Telnet.new("Host" => host_iwag, "Timeout" => false, "Prompt" => /.*\#/) {|str| print str}
+      connection = Net::Telnet.new("Host" => host_iwag, "Timeout" => false, "Prompt" => /.*/) {|str| print str}
       connection.login({"Name" => username_iwag, "Password" => password_iwag, "LoginPrompt" => /Username:/}) {|str| print str}
       connection.cmd("show ip dhcp binding #{ipaddress}") {
           |c|
         dump << c
       }
@@ -80,31 +80,31 @@
 
       if as[4] != nil && as[3] != ""
         access_interface = as[4].gsub!("  ", "").split(" ").last
         return access_interface
       else
-        answer ="false"
+        answer = 'false'
         return answer
       end
     rescue
       begin
-        connection = Net::Telnet.new("Host" => host_iwag, "Timeout" => false, "Prompt" => /.*\#/) {|str| print str}
-        connection.login({"Name" => username_iwag, "Password" => password_iwag, "LoginPrompt" => /Username:/}) {|str| print str}
+        connection = Net::Telnet.new('Host' => host_iwag, 'Timeout' => false, 'Prompt' => /.*/) {|str| print str}
+        connection.login({'Name' => username_iwag, 'Password' => password_iwag, 'LoginPrompt' => /Username:/}) {|str| print str}
         connection.cmd("show ip dhcp binding #{ipaddress}") {
             |c|
           dump << c
         }
         connection.close
         as = dump.split("\n")
         if as[4] != nil && as[3] != ""
           access_interface = as[4].gsub!("  ", "").split(" ").last
           return access_interface
         else
-          answer ="false"
+          answer ='false'
           return answer
         end
       rescue
-        return "unknown"
+        return 'unknown'
       end
     end
   end
 
 
\ No newline at end of file