netdisco 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717c023a9db51e3af00801112bbeaf47ab48159b98db46932bfd03243fcd5965
-  data.tar.gz: 5c871ee533134fd8e9e6e840c2cb6b598b031b013979247ef529d1565d2cc7ad
+  metadata.gz: 16f405c4657e51cf5421806990865bd05c46bc2a887e7ac022897f643449879a
+  data.tar.gz: 801394ad4dfcea976618f1f5b3af828037ee15e2aef7c4ccc93d93cacd6e6ccc
 SHA512:
-  metadata.gz: 5f2bdf61addfe71f2bdcdeb6b0728ae36fc9453f9edcce7e74c0c158bcf8bdcb4223ca8df25967c9ebfbfaaf65b2aebe7b7ba0f4a55e27bb1e946d95e49670e7
-  data.tar.gz: bfdabe4b30c8e3e5867b42ab9f6af9efa1748df080ed09cae4c37deef316086e72808a3bffc420152031fa0238dcc23fac133f864b0061e8e6b3cd5b706d63ee
+  metadata.gz: 2838bd2e666ebc42f955cff1237f7c10bd498a6b465fa17cfd2598de86916a529af9b2aa403f5ebf62222edc885df38a2b2f926dc86628504215928755cf78cf
+  data.tar.gz: 933cb0a3bac7681e1ce452817ec02317565eddefdd3e631a4c08da13fa1573854b26af7ee027501ac1adf31fba2a298e99c2eb71efe8dcce54aa13de8633b2e9

data/lib/netdisco/cli.rb

@@ -11,7 +11,7 @@ class Netdisco
 
     # 网络邻居发现入口函数
     def run
-      Log.debug "Running Netdisco.new.discover ..."
+      Log.debug "RUNNING Netdisco.new.discover"
       output = Netdisco.new.discover @host
 
       # 邻居关系发现后修正处理逻辑钩子函数

data/lib/netdisco/config.rb

@@ -26,8 +26,8 @@ class Netdisco
   CONFIG.default.log            = "STDERR"
   CONFIG.default.debug          = true
   CONFIG.default.name_map       = [ # regexp match+sub of hostname (needed for LLDP)
-    ['-re\d+', ""],
-    ["^KILLME(.*(?<!mojo.local)$)", '\1.mojo.local'], # adds missing domain name
+    ['-\d+', ""],
+    ["^(.*(?<!mojo.local)$)", '\1.mojo.local'], # adds missing domain name
   ]
   # 加载配置并设置对应常量
   CONFIG.load

data/lib/netdisco/dns.rb

@@ -27,7 +27,7 @@ class Netdisco
             @cache_ip[name] = Resolv.getaddress name
           end
         rescue StandardError => e
-          Log.debug "DNS resolution for '#{name}' raised error '#{e.class}' with message '#{e.message}'"
+          Log.debug "DNS resolution/getip for '#{name}' raised error '#{e.class}' with message '#{e.message}'"
           nil
         end
       end
@@ -42,9 +42,10 @@ class Netdisco
       else
         begin
           @cache_name[ip] = Resolv.getname ip
-        rescue StoreError => e
-          Log.debug "DNS resolution for '#{ip}' raised error '#{e.class}' with message '#{e.message}'"
+        rescue StandardError => e
+          Log.debug "DNS resolution/getname for '#{ip}' raised error '#{e.class}' with message '#{e.message}'"
           @cache_name[ip] = ip
+          ip
         end
       end
     end

data/lib/netdisco/method/cdp.rb

@@ -18,16 +18,16 @@ class Netdisco
       def make_peers
         peers = []
         @mib.by_oid(PEERS_BY).each do |_, vb|
-          peer          = Peer.new
-          peer_id       = vb.oid_id(PEERS_BY)
-          peer.oid      = get_oid_hash(peer_id)
-          peer.raw_ip   = @mib[OID[:cdpCacheAddress], peer_id].as_ip
+          peer     = Peer.new
+          peer_id  = vb.oid_id(PEERS_BY)
+          peer.oid = get_oid_hash(peer_id)
+          peer.raw_ip = @mib[OID[:cdpCacheAddress], peer_id].as_ip rescue peer.ip
           peer.raw_name = @mib[OID[:cdpCacheDeviceId], peer_id].value
-          peer.ip       = get_ip(peer.raw_ip, peer.raw_name)
-          peer.dst      = @mib[OID[:cdpCacheDevicePort], peer_id].value
-          peer.src      = @mib[OID[:cdpInterfaceName], peer_id.first]
-          peer.src      = peer.src&.value if peer.src
-          peer.raw_ip   = @mib[OID[:cdpCacheAddress], peer_id].value
+          # 修正设备命名
+          peer.ip = get_ip(peer.raw_ip, peer.raw_name)
+          peer.src = @mib[OID[:cdpInterfaceName], peer_id.first].value rescue nil
+          peer.dst = @mib[OID[:cdpCacheDevicePort], peer_id].value rescue nil
+          # peer.raw_ip = @mib[OID[:cdpCacheAddress], peer_id].value
           peers << peer
         end
         peers

data/lib/netdisco/method/xdp.rb

@@ -26,7 +26,6 @@ class Netdisco
     # 轮询设备邻居关系
     def poll
       @mib = @snmp.hashwalk self.class::MIB
-      # require "pp"; PP.pp @mib
       make_peers
     rescue SNMP::NoResponse
       []

data/lib/netdisco/name_map.rb

@@ -4,6 +4,13 @@ class Netdisco
   module NameMap
     def name_map(origin_name)
       name = origin_name.dup
+      # 早期异常拦截
+      if name.nil?
+        Log.debug "Netdisco name_map origin_name is nil"
+        return nil
+      end
+
+      # 字典替换
       CFG.name_map.each do |match, replace|
         re   = Regexp.new match
         name = name.sub re, replace

data/lib/netdisco/snmp.rb

@@ -44,14 +44,16 @@ class Netdisco
       # 初始化变量
       last, oid, results = false, root.dup, []
       # 将点分10进制字串转换为数组对象
-      root = root.split(".").map { |chr| chr.to_i }
+      # root = root.split(".").map { |chr| chr.to_i }
+
       # 遍历 root_oid
       until last
         vbs = snmp(:get_bulk, 0, CFG.snmp.bulkrows, oid).varbind_list
         vbs.each do |vb|
-          oid = vb.oid
+          oid = vb.name.to_str
           # 解析到的 oid 不匹配 root 跳出循环
-          (last = true; break) unless oid[0..root.size - 1] == root
+          (last = true; break) unless oid.match?(/^#{Regexp.quote(root)}/)
+          # (last = true; break) unless oid[0..root.size - 1] == root
           results << vb
         end
       end

data/lib/netdisco/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Netdisco
-  VERSION = "0.0.5"
+  VERSION = "0.0.8"
 end

data/lib/netdisco.rb

@@ -60,8 +60,10 @@ class Netdisco
     @hosts[host] = peers = neighbors(host)
     # 第二步遍历邻居的邻居关系
     peers.each do |peer|
+      # 自动跳过已发现设备IP
       next if @hosts.has_key? peer.ip
       next unless @poll.include? peer.ip
+      # 发现邻居关系
       discover peer.ip
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netdisco
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - WENWU.YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snmp
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 description: Netdisco is working for network snmp discovery
 email:
 - careline@foxmail.com