snmp 1.2.0 → 1.3.1

data/lib/snmp/pdu.rb

@@ -23,8 +23,6 @@
 require 'snmp/ber'
 require 'snmp/varbind'
 
-include SNMP::BER
-
 module SNMP
 
   # Exceptions thrown during message/pdu decoding
@@ -40,6 +38,9 @@ module SNMP
   SNMP_TRAP_OID_OID = ObjectId.new("1.3.6.1.6.3.1.1.4.1.0")
 
   class Message
+    include SNMP::BER::Encode
+    extend SNMP::BER::Decode
+
     attr_reader :version
     attr_reader :community
     attr_reader :pdu
@@ -57,9 +58,9 @@ module SNMP
 
       def decode_version(data)
         version_data, remainder = decode_integer(data)
-        if version_data == SNMP_V1
+        if version_data == BER::SNMP_V1
           version = :SNMPv1
-        elsif version_data == SNMP_V2C
+        elsif version_data == BER::SNMP_V2C
           version = :SNMPv2c
         else
           raise UnsupportedVersion, version_data.to_s
@@ -70,24 +71,24 @@ module SNMP
       def decode_pdu(version, data, mib=nil)
         pdu_tag, pdu_data, remainder = decode_tlv(data)
         case pdu_tag
-        when GetRequest_PDU_TAG
+        when BER::GetRequest_PDU_TAG
           pdu = PDU.decode(GetRequest, pdu_data, mib)
-        when GetNextRequest_PDU_TAG
+        when BER::GetNextRequest_PDU_TAG
           pdu = PDU.decode(GetNextRequest, pdu_data, mib)
-        when Response_PDU_TAG
+        when BER::Response_PDU_TAG
           pdu = PDU.decode(Response, pdu_data, mib)
-        when SetRequest_PDU_TAG
+        when BER::SetRequest_PDU_TAG
           pdu = PDU.decode(SetRequest, pdu_data, mib)
-        when SNMPv1_Trap_PDU_TAG
+        when BER::SNMPv1_Trap_PDU_TAG
           raise InvalidPduTag, "SNMPv1-trap not valid for #{version.to_s}" if version != :SNMPv1
           pdu = SNMPv1_Trap.decode(pdu_data, mib)
-        when GetBulkRequest_PDU_TAG
+        when BER::GetBulkRequest_PDU_TAG
           raise InvalidPduTag, "get-bulk not valid for #{version.to_s}" if version != :SNMPv2c
           pdu = PDU.decode(GetBulkRequest, pdu_data, mib)
-        when InformRequest_PDU_TAG
+        when BER::InformRequest_PDU_TAG
           raise InvalidPduTag, "inform not valid for #{version.to_s}" if version != :SNMPv2c
           pdu = PDU.decode(InformRequest, pdu_data, mib)
-        when SNMPv2_Trap_PDU_TAG
+        when BER::SNMPv2_Trap_PDU_TAG
           raise InvalidPduTag, "SNMPv2c-trap not valid for #{version.to_s}" if version != :SNMPv2c
           pdu = PDU.decode(SNMPv2_Trap, pdu_data, mib)
         else
@@ -109,9 +110,9 @@ module SNMP
 
     def encode_version(version)
       if version == :SNMPv1
-        encode_integer(SNMP_V1)
+        encode_integer(BER::SNMP_V1)
       elsif version == :SNMPv2c
-        encode_integer(SNMP_V2C)
+        encode_integer(BER::SNMP_V2C)
       else
         raise UnsupportedVersion, version.to_s
       end
@@ -126,6 +127,9 @@ module SNMP
   end
 
   class PDU
+    include SNMP::BER::Encode
+    extend SNMP::BER::Decode
+
     attr_accessor :request_id
     attr_accessor :error_index
     attr_accessor :varbind_list
@@ -202,19 +206,19 @@ module SNMP
 
   class GetRequest < PDU
     def encode
-      encode_pdu(GetRequest_PDU_TAG)
+      encode_pdu(BER::GetRequest_PDU_TAG)
     end
   end
 
   class GetNextRequest < PDU
     def encode
-      encode_pdu(GetNextRequest_PDU_TAG)
+      encode_pdu(BER::GetNextRequest_PDU_TAG)
     end
   end
 
   class SetRequest < PDU
     def encode
-      encode_pdu(SetRequest_PDU_TAG)
+      encode_pdu(BER::SetRequest_PDU_TAG)
     end
   end
 
@@ -222,8 +226,15 @@ module SNMP
     alias max_repetitions error_index
     alias max_repetitions= error_index=
 
+    def initialize(request_id, varbind_list, non_repeaters, max_repetitions)
+      super(request_id, varbind_list)
+      # Reuse attributes of superclass - same encoding
+      @error_status = non_repeaters
+      @error_index = max_repetitions
+    end
+
     def encode
-      encode_pdu(GetBulkRequest_PDU_TAG)
+      encode_pdu(BER::GetBulkRequest_PDU_TAG)
     end
 
     def non_repeaters=(number)
@@ -244,7 +255,7 @@ module SNMP
     end
 
     def encode
-      encode_pdu(Response_PDU_TAG)
+      encode_pdu(BER::Response_PDU_TAG)
     end
   end
 
@@ -257,7 +268,7 @@ module SNMP
   #
   class SNMPv2_Trap < PDU
     def encode
-      encode_pdu(SNMPv2_Trap_PDU_TAG)
+      encode_pdu(BER::SNMPv2_Trap_PDU_TAG)
     end
 
     ##
@@ -301,7 +312,7 @@ module SNMP
   #
   class InformRequest < SNMPv2_Trap
     def encode
-      encode_pdu(InformRequest_PDU_TAG)
+      encode_pdu(BER::InformRequest_PDU_TAG)
     end
   end
 
@@ -309,6 +320,9 @@ module SNMP
   # The PDU class for traps in SNMPv1.
   #
   class SNMPv1_Trap
+    include SNMP::BER::Encode
+    extend SNMP::BER::Decode
+
     ##
     # Returns the source IP address for the trap, usually derived from the
     # source IP address of the packet that delivered the trap.
@@ -383,7 +397,7 @@ module SNMP
         encode_integer(@specific_trap) <<
         @timestamp.encode <<
         @varbind_list.encode
-      encode_tlv(SNMPv1_Trap_PDU_TAG, pdu_data)
+      encode_tlv(BER::SNMPv1_Trap_PDU_TAG, pdu_data)
     end
 
     def each_varbind(&block)

data/lib/snmp/varbind.rb

@@ -22,14 +22,15 @@
 
 require 'snmp/ber'
 
-include SNMP::BER
-
 module SNMP
 
   class UnsupportedValueTag < RuntimeError; end
   class InvalidIpAddress < ArgumentError; end
 
   class VarBindList < Array
+    include SNMP::BER::Encode
+    extend SNMP::BER::Decode
+
     def self.decode(data, mib=nil)
       list = VarBindList.new
       varbind_data, remainder = decode_sequence(data)
@@ -71,6 +72,8 @@ module SNMP
   end
 
   class Integer
+    include SNMP::BER::Encode
+    extend SNMP::BER::Decode
     include Comparable
 
     def self.decode(value_data)
@@ -86,11 +89,12 @@ module SNMP
     end
 
     def <=>(other)
+      return nil unless other.respond_to? :to_i
       @value <=> other.to_i
     end
 
     def coerce(other)
-      if other.kind_of? Fixnum
+      if other.kind_of? ::Integer
         return [other, @value]
       else
         return [other.to_f, self.to_f]
@@ -128,6 +132,7 @@ module SNMP
   end
 
   class OctetString < String
+    include SNMP::BER::Encode
     def self.decode(value_data)
       OctetString.new(value_data)
     end
@@ -148,6 +153,8 @@ module SNMP
   end
 
   class ObjectId < Array
+    include SNMP::BER::Encode
+    extend SNMP::BER::Decode
     include Comparable
 
     def self.decode(value_data, mib=nil)
@@ -258,6 +265,8 @@ module SNMP
   end
 
   class IpAddress
+    include SNMP::BER::Encode
+
     class << self
       def decode(value_data)
         IpAddress.new(value_data, false)
@@ -325,7 +334,7 @@ module SNMP
     end
 
     def encode
-      encode_tlv(IpAddress_TAG, @value)
+      encode_tlv(BER::IpAddress_TAG, @value)
     end
 
     private
@@ -364,7 +373,7 @@ module SNMP
     end
 
     def encode
-      encode_tagged_integer(Counter32_TAG, @value)
+      encode_tagged_integer(BER::Counter32_TAG, @value)
     end
   end
 
@@ -374,7 +383,7 @@ module SNMP
     end
 
     def encode
-      encode_tagged_integer(Gauge32_TAG, @value)
+      encode_tagged_integer(BER::Gauge32_TAG, @value)
     end
   end
 
@@ -384,7 +393,7 @@ module SNMP
     end
 
     def encode
-      encode_tagged_integer(Unsigned32_TAG, @value)
+      encode_tagged_integer(BER::Unsigned32_TAG, @value)
     end
   end
 
@@ -394,7 +403,7 @@ module SNMP
     end
 
     def encode
-      encode_tagged_integer(TimeTicks_TAG, @value)
+      encode_tagged_integer(BER::TimeTicks_TAG, @value)
     end
 
     def to_s
@@ -426,7 +435,7 @@ module SNMP
     end
 
     def encode
-      encode_tlv(Opaque_TAG, self)
+      encode_tlv(BER::Opaque_TAG, self)
     end
   end
 
@@ -446,11 +455,13 @@ module SNMP
     end
 
     def encode
-      encode_tagged_integer(Counter64_TAG, @value)
+      encode_tagged_integer(BER::Counter64_TAG, @value)
     end
   end
 
   class Null
+    extend SNMP::BER::Encode
+
     class << self
       def decode(value_data)
         Null
@@ -471,13 +482,15 @@ module SNMP
   end
 
   class NoSuchObject
+    extend SNMP::BER::Encode
+
     class << self
       def decode(value_data)
         NoSuchObject
       end
 
       def encode
-        encode_exception(NoSuchObject_TAG)
+        encode_exception(BER::NoSuchObject_TAG)
       end
 
       def asn1_type
@@ -491,13 +504,15 @@ module SNMP
   end
 
   class NoSuchInstance
+    extend SNMP::BER::Encode
+
     class << self
       def decode(value_data)
         NoSuchInstance
       end
 
       def encode
-        encode_exception(NoSuchInstance_TAG)
+        encode_exception(BER::NoSuchInstance_TAG)
       end
 
       def asn1_type
@@ -511,13 +526,15 @@ module SNMP
   end
 
   class EndOfMibView
+    extend SNMP::BER::Encode
+
     class << self
       def decode(value_data)
         EndOfMibView
       end
 
       def encode
-        encode_exception(EndOfMibView_TAG)
+        encode_exception(BER::EndOfMibView_TAG)
       end
 
       def asn1_type
@@ -531,6 +548,9 @@ module SNMP
   end
 
   class VarBind
+    include SNMP::BER::Encode
+    extend SNMP::BER::Decode
+
     attr_accessor :name
     attr_accessor :value
 
@@ -546,20 +566,20 @@ module SNMP
       end
 
       ValueDecoderMap = {
-        INTEGER_TAG           => Integer,
-        OCTET_STRING_TAG      => OctetString,
-        NULL_TAG              => Null,
-        OBJECT_IDENTIFIER_TAG => ObjectId,
-        IpAddress_TAG         => IpAddress,
-        Counter32_TAG         => Counter32,
-        Gauge32_TAG           => Gauge32,
+        BER::INTEGER_TAG           => Integer,
+        BER::OCTET_STRING_TAG      => OctetString,
+        BER::NULL_TAG              => Null,
+        BER::OBJECT_IDENTIFIER_TAG => ObjectId,
+        BER::IpAddress_TAG         => IpAddress,
+        BER::Counter32_TAG         => Counter32,
+        BER::Gauge32_TAG           => Gauge32,
         # note Gauge32 tag same as Unsigned32
-        TimeTicks_TAG         => TimeTicks,
-        Opaque_TAG            => Opaque,
-        Counter64_TAG         => Counter64,
-        NoSuchObject_TAG      => NoSuchObject,
-        NoSuchInstance_TAG    => NoSuchInstance,
-        EndOfMibView_TAG      => EndOfMibView
+        BER::TimeTicks_TAG         => TimeTicks,
+        BER::Opaque_TAG            => Opaque,
+        BER::Counter64_TAG         => Counter64,
+        BER::NoSuchObject_TAG      => NoSuchObject,
+        BER::NoSuchInstance_TAG    => NoSuchInstance,
+        BER::EndOfMibView_TAG      => EndOfMibView
       }
 
       def decode_value(data)

data/lib/snmp/version.rb

@@ -1,3 +1,3 @@
 module SNMP
-  VERSION = "1.2.0"
+  VERSION = "1.3.1"
 end

data/test/test_ber.rb

@@ -4,9 +4,10 @@ require 'minitest/autorun'
 require 'snmp/varbind'
 require 'snmp/ber'
 
-class ASN1_Test < MiniTest::Unit::TestCase
+class ASN1_Test < Minitest::Test
 
-  include SNMP::BER
+  include SNMP::BER::Encode
+  include SNMP::BER::Decode
 
   def test_decode_tlv_empty
     tag, value, data = decode_tlv("\001\000")
@@ -56,20 +57,20 @@ class ASN1_Test < MiniTest::Unit::TestCase
 
   # Check invalid length - ASN.1 says that first length octet can't be 255.
   def test_bad_length
-    assert_raises(InvalidLength) {
+    assert_raises(BER::InvalidLength) {
       decode_tlv("\001\377\001")
     }
   end
 
   # Check if input data is too short
   def test_out_of_data
-    assert_raises(OutOfData) {
+    assert_raises(BER::OutOfData) {
       decode_tlv("\001\001")
     }
-    assert_raises(OutOfData) {
+    assert_raises(BER::OutOfData) {
       decode_tlv("\001")
     }
-    assert_raises(OutOfData) {
+    assert_raises(BER::OutOfData) {
       decode_tlv("")
     }
   end
@@ -103,7 +104,7 @@ class ASN1_Test < MiniTest::Unit::TestCase
     assert_equal(255, i)
     assert_equal("", data)
 
-    assert_raises(InvalidTag) {
+    assert_raises(BER::InvalidTag) {
       decode_integer("\001\004\001\002\003\004")
     }
   end
@@ -113,7 +114,7 @@ class ASN1_Test < MiniTest::Unit::TestCase
     assert_equal(16909060, i)
     assert_equal("", data)
 
-    assert_raises(InvalidTag) {
+    assert_raises(BER::InvalidTag) {
       decode_timeticks("\002\004\001\002\003\004")
     }
   end
@@ -122,7 +123,7 @@ class ASN1_Test < MiniTest::Unit::TestCase
   def test_decode_octet_string
     s, _ = decode_octet_string("\004\202\000\005hello")
     assert_equal("hello",s)
-    assert_raises(InvalidTag) {
+    assert_raises(BER::InvalidTag) {
       decode_octet_string("\005\202\000\005hello")
     }
   end
@@ -130,10 +131,10 @@ class ASN1_Test < MiniTest::Unit::TestCase
   def test_decode_ip_address
     ip, _ = decode_ip_address("@\004\001\002\003\004")
     assert_equal(ip, "\001\002\003\004")
-    assert_raises(InvalidTag) {
+    assert_raises(BER::InvalidTag) {
       decode_ip_address("\004\004\001\002\003\004")
     }
-    assert_raises(InvalidLength) {
+    assert_raises(BER::InvalidLength) {
       decode_ip_address("@\005\001\002\003\004\005")
     }
   end
@@ -148,7 +149,7 @@ class ASN1_Test < MiniTest::Unit::TestCase
     assert_equal("\002\001\077", seq)
     assert_equal("\002\001\001", data)
 
-    assert_raises(InvalidTag) {
+    assert_raises(BER::InvalidTag) {
       decode_sequence("\061\003\002\001\077")
     }
   end
@@ -180,7 +181,7 @@ class ASN1_Test < MiniTest::Unit::TestCase
     assert_equal([0,0], object_id);
     assert_equal("", remainder)
 
-    assert_raises(InvalidTag) do
+    assert_raises(BER::InvalidTag) do
       decode_object_id("\007\001+")
     end
   end
@@ -191,7 +192,7 @@ class ASN1_Test < MiniTest::Unit::TestCase
     assert_equal("\177", encode_length(127))
     assert_equal("\201\200", encode_length(128))
     assert_equal("\202\002\001", encode_length(513))
-    assert_raises(InvalidLength) { encode_length(-1) }
+    assert_raises(BER::InvalidLength) { encode_length(-1) }
   end
 
   def test_encode_integer
@@ -232,8 +233,8 @@ class ASN1_Test < MiniTest::Unit::TestCase
     assert_equal("\006\002+\006", encode_object_id([1,3,6]))
     assert_equal("\006\003+\202\001", encode_object_id([1,3,257]))
     assert_equal("\006\003" << 82.chr << "\202\001", encode_object_id([2,2,257]))
-    assert_raises(InvalidObjectId) { encode_object_id([3,2,257]) }
-    assert_raises(InvalidObjectId) { encode_object_id([]) }
+    assert_raises(BER::InvalidObjectId) { encode_object_id([3,2,257]) }
+    assert_raises(BER::InvalidObjectId) { encode_object_id([]) }
 
     assert_equal("\006\a+\203\377\177\203\377\177",
                  encode_object_id(SNMP::ObjectId.new("1.3.65535.65535")))

data/test/test_manager.rb

@@ -17,7 +17,7 @@ class EchoTransport
   end
 end
 
-class TestConfig < MiniTest::Unit::TestCase
+class TestConfig < Minitest::Test
 
   include SNMP
 
@@ -56,7 +56,7 @@ class TestConfig < MiniTest::Unit::TestCase
   end
 end
 
-class TestManager < MiniTest::Unit::TestCase
+class TestManager < Minitest::Test
 
   include SNMP
 
@@ -274,7 +274,7 @@ class TrapTestTransport
 end
 
 
-class TestTrapListener < MiniTest::Unit::TestCase
+class TestTrapListener < Minitest::Test
   include SNMP
 
   def test_init_no_handlers

data/test/test_mib.rb

@@ -3,7 +3,7 @@ require 'snmp/mib'
 
 module SNMP
 
-  class TestMib < MiniTest::Unit::TestCase
+  class TestMib < Minitest::Test
 
     def setup
       @mib = MIB.new

data/test/test_pdu.rb

@@ -3,7 +3,7 @@
 require 'snmp/pdu'
 require 'minitest/autorun'
 
-class TestProtocol < MiniTest::Unit::TestCase
+class TestProtocol < Minitest::Test
 
   include SNMP
 
@@ -94,9 +94,9 @@ class TestProtocol < MiniTest::Unit::TestCase
   end
 
   def test_get_bulk_create
-    request = SNMP::GetBulkRequest.new(1234, VarBindList.new("1.3.6.2"), 0, 10)
+    request = SNMP::GetBulkRequest.new(1234, VarBindList.new("1.3.6.2"), 20, 10)
     assert_equal(1234, request.request_id)
-    assert_equal(0, request.non_repeaters)
+    assert_equal(20, request.non_repeaters)
     assert_equal(10, request.max_repetitions)
     assert_equal(1, request.varbind_list.length)
     assert_equal("1.3.6.2", request.varbind_list.first.name.to_s)

data/test/test_retry.rb

@@ -53,7 +53,7 @@ class MismatchIdTransport
 end
 
 
-class TestRetry < MiniTest::Unit::TestCase
+class TestRetry < Minitest::Test
   def test_retry_count
     assert_response_count(0, 1, SNMP::RequestTimeout)
     assert_response_count(1, 2, SNMP::RequestTimeout)

data/test/test_varbind.rb

@@ -3,7 +3,7 @@
 require 'snmp/varbind'
 require 'minitest/autorun'
 
-class TestVarBind < MiniTest::Unit::TestCase
+class TestVarBind < Minitest::Test
 
   include SNMP
 
@@ -214,7 +214,7 @@ class TestVarBind < MiniTest::Unit::TestCase
   end
 
   def test_integer_create_from_string
-    i = Integer.new("12345")
+    i = SNMP::Integer.new("12345")
     assert_equal(12345, i.to_i)
   end
 
@@ -243,6 +243,8 @@ class TestVarBind < MiniTest::Unit::TestCase
     assert(123 < i1)
     assert(123.0 < i1)
     assert(i2 > 54000)
+    assert(i1 != NoSuchInstance)
+    assert(NoSuchInstance != i1)
   end
 
   def test_integer_to_oid

data/test/test_walk.rb

@@ -65,7 +65,7 @@ class YamlDataTransport
   end
 end
 
-class TestTransport < MiniTest::Unit::TestCase
+class TestTransport < Minitest::Test
 
   def test_get
     YamlDataTransport.load_data(File.dirname(__FILE__) + "/if_table6.yaml")
@@ -85,7 +85,7 @@ class TestTransport < MiniTest::Unit::TestCase
 
 end
 
-class TestWalk < MiniTest::Unit::TestCase
+class TestWalk < Minitest::Test
 
   ##
   # A single string or single ObjectId can be passed to walk()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snmp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Dave Halliday
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby implementation of SNMP (the Simple Network Management Protocol).
 email: hallidave@gmail.com
@@ -316,8 +316,9 @@ files:
 - test/test_smi.rb
 - test/test_varbind.rb
 - test/test_walk.rb
-homepage: http://snmplib.rubyforge.org
-licenses: []
+homepage: https://github.com/hallidave/ruby-snmp
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -331,15 +332,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: snmplib
-rubygems_version: 2.2.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Ruby implementation of SNMP (the Simple Network Management Protocol).