ipscanner 0.1.4 → 0.1.5

data/lib/ipscanner.rb

@@ -5,27 +5,14 @@
 require 'socket'
 
 class IPScanner
-
-  def initialize(ip_base='192.168.1.')
-    @ip_base = ip_base
-    @a = []
-    threads = (1..254).map{|i| Thread.new {ip = ip_base + i.to_s; @a << i if pingecho(ip, 1)}}
-    threads.join
-  end
   
-  def self.run(ip_base='192.168.1.')
+  def self.scan(ip_base='192.168.1.', range=1..254, t=1)
     a = []
-    threads = (1..254).map{|i| Thread.new {ip = ip_base + i.to_s; a << i if pingecho(ip_base + i.to_s, 1) }}
-    threads.join
-    a.sort.map{|x| ip_base + x.to_s}
+    (range).map{|i| Thread.new {a << i if pingecho(ip_base+i.to_s, t) }}.join
+    sleep t + 0.25
+    a.map{|x| ip_base + x.to_s}
   end
-
-  def self.scan(ip_base='192.168.1.') self.run  end
-    
-  def to_a()
-    @a.sort.map{|x| @ip_base + x.to_s}        
-  end
-  
+      
   def self.pingecho(host, timeout=5, service="echo")
     begin
       timeout(timeout) do

metadata

@@ -2,7 +2,7 @@
 name: ipscanner
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - James Robertson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 +00:00
+date: 2011-12-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency