snmp 1.3.1 → 1.3.3

data/dump_yaml.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'snmp'
+require 'yaml'
+
+varbinds = []
+SNMP::Manager.open do |snmp|
+  snmp.walk("ifTable") do |vb|
+    varbinds << [vb.name.to_s, vb.value.to_s, vb.value.class.to_s]
+  end
+end
+
+puts varbinds.to_yaml
+

data/import.rb

@@ -0,0 +1,22 @@
+# use local implementation, not the installed gem (if any)
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/lib")
+
+require 'snmp/mib'
+
+if ARGV.size == 1
+  mib_path = ARGV[0]
+else
+  smilint_version = `smilint --version`
+  libsmi_version = smilint_version.split[1]
+  mib_path = "/usr/local/Cellar/libsmi/#{libsmi_version}/share/mibs/ietf"
+end
+
+Dir["#{mib_path}/*"].each do |file|
+  print file
+  if (File.basename(file) == 'DOT12-RPTR-MIB')
+    puts " (skipping)"
+  else
+    puts
+    SNMP::MIB::import_module(file)
+  end
+end

data/lib/snmp/agent.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright (c) 2004-2014 David R. Halliday
 #

data/lib/snmp/ber.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Copyright (c) 2004-2014 David R. Halliday
 #
@@ -265,9 +266,9 @@ module SNMP
         else
           data = integer_to_octets(value)
           if value > 0 && data[0].ord > 0x7f
-            data = "\000" << data
+            data = "\000".dup << data
           elsif value < 0 && data[0].ord < 0x80
-            data = "\377" << data
+            data = "\377".dup << data
           end
         end
         encode_tlv(tag, data)
@@ -333,7 +334,7 @@ module SNMP
       def encode_object_id(value)
         raise InvalidObjectId, value.to_s if value.length < 1
         raise InvalidObjectId, value.to_s if value[0] > 2
-        data = ""
+        data = "".dup
         if (value.length > 1)
           raise InvalidObjectId if value[0] < 2 && value[1] > 40
           data << (40 * value[0] + value[1]).chr

data/lib/snmp/manager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright (c) 2004-2014 David R. Halliday
 #
@@ -204,7 +205,8 @@ module SNMP
       @transport = config.create_transport
       @max_bytes = config.max_recv_bytes
       @mib = MIB.new
-      load_modules(config.mib_modules, config.mib_dir)
+      @mib_dir = config.mib_dir
+      load_modules(config.mib_modules, @mib_dir)
       @ignore_oid_order = config.ignore_oid_order
       @config = config.applied_config
     end
@@ -232,10 +234,6 @@ module SNMP
       @transport.close
     end
 
-    def load_module(name)
-      @mib.load_module(name)
-    end
-
     ##
     # Sends a get request for the supplied list of ObjectId or VarBind
     # objects.
@@ -489,8 +487,12 @@ module SNMP
       @@request_id.force_next(request_id)
     end
 
-    def load_modules(module_list, mib_dir)
-      module_list.each { |m| @mib.load_module(m, mib_dir) }
+    def load_module(name, mib_dir = @mib_dir)
+      @mib.load_module(name, mib_dir)
+    end
+
+    def load_modules(module_list, mib_dir = @mib_dir)
+      module_list.each { |m| load_module(m, mib_dir) }
     end
 
     private
@@ -622,7 +624,8 @@ module SNMP
       @community = config.community
       @max_bytes = config.max_recv_bytes
       @mib = MIB.new
-      load_modules(config.mib_modules, config.mib_dir)
+      @mib_dir = config.mib_dir
+      load_modules(config.mib_modules, @mib_dir)
       @config = config.applied_config
 
       @handler_init = block
@@ -696,12 +699,16 @@ module SNMP
     alias kill exit
     alias terminate exit
 
-    private
+    def load_module(name, mib_dir = @mib_dir)
+      @mib.load_module(name, mib_dir)
+    end
 
-    def load_modules(module_list, mib_dir)
-      module_list.each { |m| @mib.load_module(m, mib_dir) }
+    def load_modules(module_list, mib_dir = @mib_dir)
+      module_list.each { |m| load_module(m, mib_dir) }
     end
 
+    private
+
     def process_traps(trap_listener)
       @handler_init.call(trap_listener) if @handler_init
       loop do

data/lib/snmp/mib.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright (c) 2004-2014 David R. Halliday
 #
@@ -163,6 +164,7 @@ module SNMP
       end
       @by_name.merge!(oid_hash) do |key, old, value|
         warn "warning: overwriting old MIB name '#{key}'"
+        value
       end
       @by_module_by_name[module_name] = {}
       @by_module_by_name[module_name].merge!(oid_hash)

data/lib/snmp/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright (c) 2004-2014 David R. Halliday
 #

data/lib/snmp/pdu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright (c) 2004-2014 David R. Halliday
 #
@@ -179,8 +180,8 @@ module SNMP
     def error_status=(status)
       @error_status = ERROR_STATUS_CODE[status]
       unless @error_status
-        if status.respond_to?(:to_int) && ERROR_STATUS_NAME[status.to_int]
-          @error_status = status
+        if status.respond_to?(:to_int)
+          @error_status = status.to_int
         else
           raise InvalidErrorStatus, status.to_s
         end
@@ -188,7 +189,7 @@ module SNMP
     end
 
     def error_status
-      ERROR_STATUS_NAME[@error_status]
+      ERROR_STATUS_NAME[@error_status] || @error_status
     end
 
     def encode_pdu(pdu_tag)

data/lib/snmp/varbind.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright (c) 2004-2014 David R. Halliday
 #
@@ -63,7 +64,7 @@ module SNMP
     end
 
     def encode
-      varbind_data = ""
+      varbind_data = "".dup
       self.each do |varbind|
         varbind_data << varbind.encode
       end
@@ -343,7 +344,7 @@ module SNMP
         if parts.length != 4
           raise InvalidIpAddress, "Expected four octets separated by dots, not #{ip_string.inspect}"
         end
-        value_data = ""
+        value_data = "".dup
         parts.each do |s|
           octet = s.to_i
           raise InvalidIpAddress, "Octets cannot be greater than 255: #{ip_string.inspect}" if octet > 255

data/lib/snmp/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SNMP
-  VERSION = "1.3.1"
+  VERSION = "1.3.3"
 end

data/lib/snmp.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright (c) 2004-2014 David R. Halliday
 #