pingfacts 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e292ddadb1df2eacdb19ad584f375451a97cb5ad215198c91002c28a1e131c48
-  data.tar.gz: 1e42044bfa77c46f96c55e3b3e45f6b88a6baa39167e1be9fb2f5d58e1f6f41b
+  metadata.gz: 5880c3130b81fd512994a5c36a3ad567b1fd5919e55287df1f9e02b2fe859b6f
+  data.tar.gz: ca8f8df30be102cd62e96d817cc55f0748d1cd79d8957abb3203c62bbe3688d5
 SHA512:
-  metadata.gz: a4655c52d704d5a19a9daf70ea8a240a638b11c2eea54d71aaf396741ff664b41e7002edee0cfb0c9d23e9f581a5e4b5248a2ad88ba54a345a8c692db5af8f99
-  data.tar.gz: 80ddf560aaa5887b2bc0983a02bfdc6fb03f87a587b015f322b334700c3d3f0af048c23d29f9e88e22a348e976f8cfe53b9e1301aed60c46e25ab22288fb0b50
+  metadata.gz: '05008e388edfca4ef1c4307819631951d947bb06fbc8b19e82f2f10c27e06bc5208c65e9476a54ebbfe1fd426c520742a0dc5a37bdac19f4eff5b6a5f7accc80'
+  data.tar.gz: 50c9e2a913413ef74c4d47f8112d0bc134d821fc8b202bba921523b4eb3c741dfdcf042642705239acae3653dfd1e52e37b9d8af3c24cdd13f2eb1f7c5196cb7

data/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    pingfacts (0.1.0)
+    pingfacts (0.1.2)
+      net-ping (~> 2.0)
+      pry (~> 0.13)
 
 GEM
   remote: https://rubygems.org/

data/lib/pingfacts.rb

@@ -1,4 +1,6 @@
 require "pingfacts/version"
+require "open-uri"
+require "etc"
 require "ipaddr"
 require "resolv"
 require "net/ping"
@@ -7,20 +9,137 @@ module Pingfacts
   class Error < StandardError; end
 
   class PingerResult
+    @@strictmode = false
+    begin
+      @@configs = "#{Etc.getpwuid.dir}/.pingfacts"
+    rescue NoMethodError
+      @@configs = "#{File.expand_path('~')}/.pingfacts"
+    end
+    @@vendors = nil
+
     attr_accessor :ip, :dnsname, :mac
-  end
 
-  def self.scan(network, method=Net::Ping::External)
-    ip_range = IPAddr.new(network).to_range
+    def self.strictmode
+      @@strictmode
+    end
+
+    def self.strictmode=(new_value)
+      @@strictmode = new_value
+    end
+
+    def self.configs
+      @@configs
+    end
 
+    def self.configs=(new_value)
+      @@configs = new_value
+    end
+
+    def path_vendorlist
+      "#{@@configs}/vendorlist"
+    end
+
+    def prepare_configs
+      begin
+        Dir.mkdir(@@configs)
+      rescue Errno::EEXIST
+      end
+
+      vendor_content = nil
+
+      unless File.exist? path_vendorlist
+        vendor_content = URI.open("http://standards-oui.ieee.org/oui/oui.txt").read
+        open(path_vendorlist, "w") do |file|
+          file << vendor_content
+        end
+      else
+        if @@vendors.nil?
+          open(path_vendorlist, "r") do |file|
+            vendor_content = file.read
+          end
+        end
+      end
+
+      if @@vendors.nil? and (not vendor_content.nil?)
+        @@vendors = {}
+        vendor_content.lines.each do |line|
+          if (/\(base\s+16\)/i).match(line)
+            result = (/^([0-9A-F]+)\s+\(base\s+16\)\s+(.+)$/i).match(line)
+            unless result.nil?
+              @@vendors[result[1]] = result[2]
+            end
+          end
+        end
+      end
+    end
+
+    def eql?(other)
+      if @@strictmode
+        return (self.ip == other.ip and self.mac == other.mac and self.dnsname == other.dnsname)
+      end
+      result = false
+      if self.mac != nil and other.mac != nil
+        if self.mac == other.mac
+          result = true
+        end
+      end
+      if self.dnsname != nil and other.dnsname != nil
+        if self.dnsname == other.dnsname
+          return true
+        end
+      end
+      if self.ip != nil and other.ip != nil
+        if self.ip == other.ip
+          result = true
+        end
+      end
+
+      return result
+    end
+
+    def vendor
+      if self.mac.nil?
+        return nil
+      end
+      self.prepare_configs
+      teststring = self.mac.upcase.gsub /[^0-9A-F]*/i, ""
+      result = @@vendors[teststring[0,6]]
+      if result.nil?
+        return nil
+      end
+      return result.strip
+    end
+  end
+
+  def self.scan(network_args, method=Net::Ping::External)
+    network_list = []
     pingers = []
     onlines = []
 
-    ip_range.each do |ip|
-      pingers << Thread.new do
-        pinger = Net::Ping::External.new(ip.to_s)
-        if pinger.ping?
-          onlines << ip.to_s
+    if network_args.class == Array
+      network_list += network_args
+    else
+      network_list << network_args
+    end
+
+    network_list.each do |network|
+      begin
+        ip_range = IPAddr.new(network).to_range
+
+        ip_range.each do |ip|
+          pingers << Thread.new do
+            pinger = Net::Ping::External.new(ip.to_s)
+            if pinger.ping?
+              onlines << ip.to_s
+            end
+          end
+        end
+      rescue IPAddr::InvalidAddressError
+        pingers << Thread.new do
+          pinger = Net::Ping::External.new(network)
+          if pinger.ping?
+            onlines << network
+          end
         end
       end
     end
@@ -38,6 +157,7 @@ module Pingfacts
         end
       end
     rescue
+      nil
     end
 
     result = []
@@ -50,7 +170,11 @@ module Pingfacts
       end
       begin
         ipresult.dnsname = Resolv.getname(ip)
+      rescue Resolv::ResolvError
+        ipresult.ip = Resolv.getaddress(ip)
+        ipresult.dnsname = ip
       rescue
+        nil
       end
 
       result << ipresult

data/lib/pingfacts/version.rb

@@ -1,3 +1,3 @@
 module Pingfacts
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingfacts
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Adrian E.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-08 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Another Ping-Tool with additional Mac-Address information and DNS-Resolv-Name