snmp 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ad322cefc232b70f0003fd1f3ed6180d8cddb9921c5819ad371b6d2af33399b
-  data.tar.gz: f28bde102b1c66c5722b34feeff2a27ccfb846be7c1579ce5dbc12e5bbb364cf
+  metadata.gz: a7fcd45a1214475ca6b4994e449366998484949d4fbe46b580074fa7412a3d18
+  data.tar.gz: 4892233da93ed593ff4dad03eedf21d482c3bdc92ea586435452c085902077ff
 SHA512:
-  metadata.gz: e7f74d10fad99debbc6a740753b467ed053790db7b5c3fa2286ab94f343f904720f1123cf49fcb25be008b931f4498f3480de7befc50320697426804d70e9988
-  data.tar.gz: f7663d2514ce9a8fa43d75b1a32ad1cd485557d0206087a796a03109564e7e752135f68a38f86830202494e25cb4e62ee7f1a64b8c45e9385f38fe7a87fa5753
+  metadata.gz: 0d4589d39c3fc90acc39bdf5867961a55ce71922b59531ad734ef424876b2d973c65e387dc23a00f603504fbecf68edd43e0e00086f7ae49156c3b536ab5cb61
+  data.tar.gz: f92df29abd8eda6c7110444d46a2404a94f025903132ee4400255337cacfa67ed415a2f9a3135c3ce9045f007290b984f9cc5760838595f06c6e1948bb3bfc31

data/README.rdoc

@@ -25,75 +25,13 @@ This release supports the following:
 See the SNMP::Manager, SNMP::TrapListener, and SNMP::MIB classes and the
 examples below for more details.
 
-== Changes
-
-Changes for version 1.3.0:
-* Cleaned up deprecation warnings
-* Fixed SNMP::Integer#<=> method for Ruby 2.3.0 and later
-
-Changes for version 1.2.0:
-* Removed support for Ruby 1.8
-* Changed license to MIT License
-
-Changes for version 1.1.1:
-
-* Incorporate various small pull requests
-
-Changes for version 1.1.0:
-
-* Added MIB support to ObjectId and Varbind, so that to_s can return symbolic information
-* Added to_str method to ObjectId to return a numeric OID string (old to_s behavior)
-* TrapListener can now support multiple community strings
-
-Changes for version 1.0.4:
-
-* New option handling and added lower-case versions of all options
-* Added SNMP::VERSION constant
-* Experimental support for IPv6
-* Removed support for installation with setup.rb
-
-Changes for version 1.0.3:
-
-* Minor changes to Manager class.  The :Transport option may now be an
-  object or a class.  Explicity call Timeout.timeout so that a timeout
-  method may be defined in subclasses.  Thanks to Eric Monti.
-
-Changes for version 1.0.2:
-
-* Internal code changes to make this library compatible with both Ruby 1.8
-  and Ruby 1.9.  Note that an ord() method is now added to the Fixnum class
-  for Ruby 1.8.  See the ber.rb file for details.
-
-Changes for version 1.0.1:
-
-* Made the host configurable for the TrapListener.  Previously defaulted
-  to 'localhost'.
-
-Changes for version 1.0.0:
-
-* Added to_s method to TimeTicks.  Displays time in human-readable form
-  instead of just a number.  The to_i method can still be used to get the
-  number of ticks.
-
 == Installation
 
-You can use RubyGems [http://rubygems.org/] to
+You can use RubyGems[http://rubygems.org/] to
 install the latest version of the SNMP library.
 
   gem install snmp
 
-== Testing
-
-This library has received limited testing:
-* The unit tests have been executed with both Ruby 1.9.3 and Ruby 2.1.2 on
-  Mac OS X 10.9.
-* Basic interoperability testing has been done with the
-  net-snmp[http://www.net-snmp.org/] tools.
-
-I'm very interested in hearing about successes or failures on other platforms.
-
-Send me an email at hallidave at gmail.com.
-
 == Examples
 
 === Get Request
@@ -187,7 +125,59 @@ Log traps to STDOUT.
       end
   end
   m.join
-   
+
+== Changes
+
+Changes for version 1.3.1:
+* Cleaned up deprecation warnings
+* Fixed SNMP::Integer#<=> method for Ruby 2.3.0 and later
+* Removed artificial limit on number of non-repeaters for GetBulkRequest
+* SNMP::BER module no longer pollutes global namespace
+
+Changes for version 1.2.0:
+* Removed support for Ruby 1.8
+* Changed license to MIT License
+
+Changes for version 1.1.1:
+
+* Incorporate various small pull requests
+
+Changes for version 1.1.0:
+
+* Added MIB support to ObjectId and Varbind, so that to_s can return symbolic information
+* Added to_str method to ObjectId to return a numeric OID string (old to_s behavior)
+* TrapListener can now support multiple community strings
+
+Changes for version 1.0.4:
+
+* New option handling and added lower-case versions of all options
+* Added SNMP::VERSION constant
+* Experimental support for IPv6
+* Removed support for installation with setup.rb
+
+Changes for version 1.0.3:
+
+* Minor changes to Manager class.  The :Transport option may now be an
+  object or a class.  Explicity call Timeout.timeout so that a timeout
+  method may be defined in subclasses.  Thanks to Eric Monti.
+
+Changes for version 1.0.2:
+
+* Internal code changes to make this library compatible with both Ruby 1.8
+  and Ruby 1.9.  Note that an ord() method is now added to the Fixnum class
+  for Ruby 1.8.  See the ber.rb file for details.
+
+Changes for version 1.0.1:
+
+* Made the host configurable for the TrapListener.  Previously defaulted
+  to 'localhost'.
+
+Changes for version 1.0.0:
+
+* Added to_s method to TimeTicks.  Displays time in human-readable form
+  instead of just a number.  The to_i method can still be used to get the
+  number of ticks.
+
 == License
 
 This SNMP Library is released under the MIT License.
@@ -211,4 +201,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-

data/lib/snmp/ber.rb

@@ -78,278 +78,285 @@ module SNMP
     class InvalidObjectId < RuntimeError; end
     class InvalidLength < RuntimeError; end
 
-    def assert_no_remainder(remainder)
-      raise ParseError, remainder.inspect if remainder != ""
-    end
+    module Decode
 
-    #
-    # Decode tag-length-value data.  The data is assumed to be a string of
-    # bytes in network byte order.  This format is returned by Socket#recv.
-    #
-    # Returns a tuple containing the tag, the value, and any remaining
-    # unprocessed data.
-    #
-    # The data is not interpretted by this method.  Use one of the other
-    # decoding methods to interpret the data.
-    #
-    # Note that ASN.1 supports an indefinite length format where the end of
-    # content is marked by a pair of 0 octets.  SNMP does not support this
-    # format, so only the two definite forms are implemented (single byte and
-    # multi-byte).
-    #
-    def decode_tlv(data)
-      raise OutOfData if (data.length == 2 && data[1].ord != 0) || data.length < 2
-      tag = data[0].ord
-      length = data[1].ord
-      if length < 0x80
-        value = data[2, length]
-        remainder = data[length+2..-1]
-      else
-        # ASN.1 says this octet can't be 0xff
-        raise InvalidLength, length.to_s if length == 0xff
-        num_octets = length & 0x7f
-        length = build_integer(data, 2, num_octets)
-        value = data[num_octets+2, length]
-        remainder = data[num_octets+2+length..-1]
+      def assert_no_remainder(remainder)
+        raise ParseError, remainder.inspect if remainder != ""
       end
-      return tag, value, remainder
-    end
 
-    #
-    # Decode TLV data for an ASN.1 integer.
-    #
-    # Throws an InvalidTag exception if the tag is incorrect.
-    #
-    # Returns a tuple containing an integer and any remaining unprocessed data.
-    #
-    def decode_integer(data)
-      tag, value, remainder = decode_tlv(data)
-      raise InvalidTag, tag.to_s if tag != INTEGER_TAG
-      return decode_integer_value(value), remainder
-    end
+      #
+      # Decode tag-length-value data.  The data is assumed to be a string of
+      # bytes in network byte order.  This format is returned by Socket#recv.
+      #
+      # Returns a tuple containing the tag, the value, and any remaining
+      # unprocessed data.
+      #
+      # The data is not interpretted by this method.  Use one of the other
+      # decoding methods to interpret the data.
+      #
+      # Note that ASN.1 supports an indefinite length format where the end of
+      # content is marked by a pair of 0 octets.  SNMP does not support this
+      # format, so only the two definite forms are implemented (single byte and
+      # multi-byte).
+      #
+      def decode_tlv(data)
+        raise OutOfData if (data.length == 2 && data[1].ord != 0) || data.length < 2
+        tag = data[0].ord
+        length = data[1].ord
+        if length < 0x80
+          value = data[2, length]
+          remainder = data[length+2..-1]
+        else
+          # ASN.1 says this octet can't be 0xff
+          raise InvalidLength, length.to_s if length == 0xff
+          num_octets = length & 0x7f
+          length = build_integer(data, 2, num_octets)
+          value = data[num_octets+2, length]
+          remainder = data[num_octets+2+length..-1]
+        end
+        return tag, value, remainder
+      end
 
-    def decode_timeticks(data)
-      tag, value, remainder = decode_tlv(data)
-      raise InvalidTag, tag.to_s if tag != TimeTicks_TAG
-      return decode_uinteger_value(value), remainder
-    end
+      #
+      # Decode TLV data for an ASN.1 integer.
+      #
+      # Throws an InvalidTag exception if the tag is incorrect.
+      #
+      # Returns a tuple containing an integer and any remaining unprocessed data.
+      #
+      def decode_integer(data)
+        tag, value, remainder = decode_tlv(data)
+        raise InvalidTag, tag.to_s if tag != INTEGER_TAG
+        return decode_integer_value(value), remainder
+      end
 
-    def decode_integer_value(value)
-      result = build_integer(value, 0, value.length)
-      if value[0].ord[7] == 1
-        result -= (1 << (8 * value.length))
+      def decode_timeticks(data)
+        tag, value, remainder = decode_tlv(data)
+        raise InvalidTag, tag.to_s if tag != TimeTicks_TAG
+        return decode_uinteger_value(value), remainder
       end
-      result
-    end
 
-    ##
-    # Decode an integer, ignoring the sign bit.  Some agents insist on
-    # encoding 32 bit unsigned integers with four bytes even though it
-    # should be 5 bytes (at least the way I read it).
-    #
-    def decode_uinteger_value(value)
-      build_integer(value, 0, value.length)
-    end
+      def decode_integer_value(value)
+        result = build_integer(value, 0, value.length)
+        if value[0].ord[7] == 1
+          result -= (1 << (8 * value.length))
+        end
+        result
+      end
 
-    def build_integer(data, start, num_octets)
-      number = 0
-      num_octets.times { |i| number = number<<8 | data[start+i].ord }
-      return number
-    end
+      ##
+      # Decode an integer, ignoring the sign bit.  Some agents insist on
+      # encoding 32 bit unsigned integers with four bytes even though it
+      # should be 5 bytes (at least the way I read it).
+      #
+      def decode_uinteger_value(value)
+        build_integer(value, 0, value.length)
+      end
 
-    #
-    # Decode TLV data for an ASN.1 octet string.
-    #
-    # Throws an InvalidTag exception if the tag is incorrect.
-    #
-    # Returns a tuple containing a string and any remaining unprocessed data.
-    #
-    def decode_octet_string(data)
-      tag, value, remainder = decode_tlv(data)
-      raise InvalidTag, tag.to_s if tag != OCTET_STRING_TAG
-      return value, remainder
-    end
+      def build_integer(data, start, num_octets)
+        number = 0
+        num_octets.times { |i| number = number<<8 | data[start+i].ord }
+        return number
+      end
 
-    def decode_ip_address(data)
-      tag, value, remainder = decode_tlv(data)
-      raise InvalidTag, tag.to_s if tag != IpAddress_TAG
-      raise InvalidLength, tag.to_s if value.length != 4
-      return value, remainder
-    end
+      #
+      # Decode TLV data for an ASN.1 octet string.
+      #
+      # Throws an InvalidTag exception if the tag is incorrect.
+      #
+      # Returns a tuple containing a string and any remaining unprocessed data.
+      #
+      def decode_octet_string(data)
+        tag, value, remainder = decode_tlv(data)
+        raise InvalidTag, tag.to_s if tag != OCTET_STRING_TAG
+        return value, remainder
+      end
 
-    #
-    # Decode TLV data for an ASN.1 sequence.
-    #
-    # Throws an InvalidTag exception if the tag is incorrect.
-    #
-    # Returns a tuple containing the sequence data and any remaining
-    # unprocessed data that follows the sequence.
-    #
-    def decode_sequence(data)
-      tag, value, remainder = decode_tlv(data)
-      raise InvalidTag, tag.to_s if tag != SEQUENCE_TAG
-      return value, remainder
-    end
+      def decode_ip_address(data)
+        tag, value, remainder = decode_tlv(data)
+        raise InvalidTag, tag.to_s if tag != IpAddress_TAG
+        raise InvalidLength, tag.to_s if value.length != 4
+        return value, remainder
+      end
 
-    #
-    # Unwrap TLV data for an ASN.1 object identifier.  This method extracts
-    # the OID value as a character string but does not decode it further.
-    #
-    # Throws an InvalidTag exception if the tag is incorrect.
-    #
-    # Returns a tuple containing the object identifier (OID) and any
-    # remaining unprocessed data.  The OID is represented as an array
-    # of integers.
-    #
-    def decode_object_id(data)
-      tag, value, remainder = decode_tlv(data)
-      raise InvalidTag, tag.to_s if tag != OBJECT_IDENTIFIER_TAG
-      return decode_object_id_value(value), remainder
-    end
+      #
+      # Decode TLV data for an ASN.1 sequence.
+      #
+      # Throws an InvalidTag exception if the tag is incorrect.
+      #
+      # Returns a tuple containing the sequence data and any remaining
+      # unprocessed data that follows the sequence.
+      #
+      def decode_sequence(data)
+        tag, value, remainder = decode_tlv(data)
+        raise InvalidTag, tag.to_s if tag != SEQUENCE_TAG
+        return value, remainder
+      end
+
+      #
+      # Unwrap TLV data for an ASN.1 object identifier.  This method extracts
+      # the OID value as a character string but does not decode it further.
+      #
+      # Throws an InvalidTag exception if the tag is incorrect.
+      #
+      # Returns a tuple containing the object identifier (OID) and any
+      # remaining unprocessed data.  The OID is represented as an array
+      # of integers.
+      #
+      def decode_object_id(data)
+        tag, value, remainder = decode_tlv(data)
+        raise InvalidTag, tag.to_s if tag != OBJECT_IDENTIFIER_TAG
+        return decode_object_id_value(value), remainder
+      end
 
-    def decode_object_id_value(value)
-      if value.length == 0
-        object_id = []
-      else
-        value0 = value[0].ord
-        if value0 == 0x2b
-          object_id = [1,3]
+      def decode_object_id_value(value)
+        if value.length == 0
+          object_id = []
         else
-          second = value0 % 40
-          first = (value0 - second) / 40
-          raise InvalidObjectId, value.to_s if first > 2
-          object_id = [first, second]
-        end
-        n = 0
-        for i in 1...value.length
-          n = (n<<7) + (value[i].ord & 0x7f)
-          if value[i].ord < 0x80
-            object_id << n
-            n = 0
+          value0 = value[0].ord
+          if value0 == 0x2b
+            object_id = [1,3]
+          else
+            second = value0 % 40
+            first = (value0 - second) / 40
+            raise InvalidObjectId, value.to_s if first > 2
+            object_id = [first, second]
+          end
+          n = 0
+          for i in 1...value.length
+            n = (n<<7) + (value[i].ord & 0x7f)
+            if value[i].ord < 0x80
+              object_id << n
+              n = 0
+            end
           end
         end
+        return object_id
       end
-      return object_id
+
     end
 
-    #
-    # Encode the length field for TLV data.  Returns the length octets
-    # as a string.
-    #
-    def encode_length(length)
-      raise InvalidLength, length.to_s if length < 0
-      if length < 0x80
-        length.chr
-      else
-        data = integer_to_octets(length)
-        (data.size | 0x80).chr << data
+    module Encode
+
+      #
+      # Encode the length field for TLV data.  Returns the length octets
+      # as a string.
+      #
+      def encode_length(length)
+        raise InvalidLength, length.to_s if length < 0
+        if length < 0x80
+          length.chr
+        else
+          data = integer_to_octets(length)
+          (data.size | 0x80).chr << data
+        end
       end
-    end
 
-    #
-    # Encode integer
-    #
-    def encode_integer(value)
-      encode_tagged_integer(INTEGER_TAG, value)
-    end
+      #
+      # Encode integer
+      #
+      def encode_integer(value)
+        encode_tagged_integer(INTEGER_TAG, value)
+      end
 
-    def encode_tagged_integer(tag, value)
-      if value > 0 && value < 0x80
-        data = value.chr
-      else
-        data = integer_to_octets(value)
-        if value > 0 && data[0].ord > 0x7f
-          data = "\000" << data
-        elsif value < 0 && data[0].ord < 0x80
-          data = "\377" << data
+      def encode_tagged_integer(tag, value)
+        if value > 0 && value < 0x80
+          data = value.chr
+        else
+          data = integer_to_octets(value)
+          if value > 0 && data[0].ord > 0x7f
+            data = "\000" << data
+          elsif value < 0 && data[0].ord < 0x80
+            data = "\377" << data
+          end
         end
+        encode_tlv(tag, data)
       end
-      encode_tlv(tag, data)
-    end
 
-    #
-    # Helper method for encoding integer-like things.
-    #
-    def integer_to_octets(i)
-      if i >= 0
-        done = 0
-      else
-        done = -1
+      #
+      # Helper method for encoding integer-like things.
+      #
+      def integer_to_octets(i)
+        if i >= 0
+          done = 0
+        else
+          done = -1
+        end
+        octets = ""
+        begin
+          octets = (i & 0xff).chr << octets
+          i = i >> 8
+        end until i == done
+        octets
       end
-      octets = ""
-      begin
-        octets = (i & 0xff).chr << octets
-        i = i >> 8
-      end until i == done
-      octets
-    end
 
-    def encode_null
-      NULL_TAG.chr << "\000"
-    end
+      def encode_null
+        NULL_TAG.chr << "\000"
+      end
 
-    #
-    # Encode an exception.  The encoding is simply the exception tag with
-    # no data, similar to NULL.
-    #
-    def encode_exception(tag)
-      tag.chr << "\000"
-    end
+      #
+      # Encode an exception.  The encoding is simply the exception tag with
+      # no data, similar to NULL.
+      #
+      def encode_exception(tag)
+        tag.chr << "\000"
+      end
 
-    #
-    # Wraps value in a tag and length.  This method expects an
-    # integer tag and a string value.
-    #
-    def encode_tlv(tag, value)
-      data = tag.chr << encode_length(value.length)
-      data = data << value if value.length > 0
-      data
-    end
+      #
+      # Wraps value in a tag and length.  This method expects an
+      # integer tag and a string value.
+      #
+      def encode_tlv(tag, value)
+        data = tag.chr << encode_length(value.length)
+        data = data << value if value.length > 0
+        data
+      end
 
-    #
-    # Wrap string in a octet string tag and length.
-    #
-    def encode_octet_string(value)
-      encode_tlv(OCTET_STRING_TAG, value)
-    end
+      #
+      # Wrap string in a octet string tag and length.
+      #
+      def encode_octet_string(value)
+        encode_tlv(OCTET_STRING_TAG, value)
+      end
 
-    #
-    # Wrap value in a sequence tag and length.
-    #
-    def encode_sequence(value)
-      encode_tlv(SEQUENCE_TAG, value)
-    end
+      #
+      # Wrap value in a sequence tag and length.
+      #
+      def encode_sequence(value)
+        encode_tlv(SEQUENCE_TAG, value)
+      end
 
-    #
-    # Encode an object id.  The input is assumed to be an array of integers
-    # representing the object id.
-    #
-    def encode_object_id(value)
-      raise InvalidObjectId, value.to_s if value.length < 1
-      raise InvalidObjectId, value.to_s if value[0] > 2
-      data = ""
-      if (value.length > 1)
-        raise InvalidObjectId if value[0] < 2 && value[1] > 40
-        data << (40 * value[0] + value[1]).chr
-        for i in 2...value.length
-          if value[i] < 0x80
-            data << value[i].chr
-          else
-            octets = ""
-            n = value[i]
-            begin
-              octets = (n & 0x7f | 0x80).chr << octets
-              n = n >> 7
-            end until n == 0
-            octets[-1] = (octets[-1].ord & 0x7f).chr
-            data << octets
+      #
+      # Encode an object id.  The input is assumed to be an array of integers
+      # representing the object id.
+      #
+      def encode_object_id(value)
+        raise InvalidObjectId, value.to_s if value.length < 1
+        raise InvalidObjectId, value.to_s if value[0] > 2
+        data = ""
+        if (value.length > 1)
+          raise InvalidObjectId if value[0] < 2 && value[1] > 40
+          data << (40 * value[0] + value[1]).chr
+          for i in 2...value.length
+            if value[i] < 0x80
+              data << value[i].chr
+            else
+              octets = ""
+              n = value[i]
+              begin
+                octets = (n & 0x7f | 0x80).chr << octets
+                n = n >> 7
+              end until n == 0
+              octets[-1] = (octets[-1].ord & 0x7f).chr
+              data << octets
+            end
           end
+        elsif (value.length == 1)
+          data << (40 * value[0]).chr
         end
-      elsif (value.length == 1)
-        data << (40 * value[0]).chr
+        encode_tlv(OBJECT_IDENTIFIER_TAG, data)
       end
-      encode_tlv(OBJECT_IDENTIFIER_TAG, data)
-    end
 
+    end
   end
 end

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)
@@ -129,6 +132,7 @@ module SNMP
   end
 
   class OctetString < String
+    include SNMP::BER::Encode
     def self.decode(value_data)
       OctetString.new(value_data)
     end
@@ -149,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)
@@ -259,6 +265,8 @@ module SNMP
   end
 
   class IpAddress
+    include SNMP::BER::Encode
+
     class << self
       def decode(value_data)
         IpAddress.new(value_data, false)
@@ -326,7 +334,7 @@ module SNMP
     end
 
     def encode
-      encode_tlv(IpAddress_TAG, @value)
+      encode_tlv(BER::IpAddress_TAG, @value)
     end
 
     private
@@ -365,7 +373,7 @@ module SNMP
     end
 
     def encode
-      encode_tagged_integer(Counter32_TAG, @value)
+      encode_tagged_integer(BER::Counter32_TAG, @value)
     end
   end
 
@@ -375,7 +383,7 @@ module SNMP
     end
 
     def encode
-      encode_tagged_integer(Gauge32_TAG, @value)
+      encode_tagged_integer(BER::Gauge32_TAG, @value)
     end
   end
 
@@ -385,7 +393,7 @@ module SNMP
     end
 
     def encode
-      encode_tagged_integer(Unsigned32_TAG, @value)
+      encode_tagged_integer(BER::Unsigned32_TAG, @value)
     end
   end
 
@@ -395,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
@@ -427,7 +435,7 @@ module SNMP
     end
 
     def encode
-      encode_tlv(Opaque_TAG, self)
+      encode_tlv(BER::Opaque_TAG, self)
     end
   end
 
@@ -447,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
@@ -472,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
@@ -492,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
@@ -512,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
@@ -532,6 +548,9 @@ module SNMP
   end
 
   class VarBind
+    include SNMP::BER::Encode
+    extend SNMP::BER::Decode
+
     attr_accessor :name
     attr_accessor :value
 
@@ -547,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.3.0"
+  VERSION = "1.3.1"
 end

data/test/test_ber.rb

@@ -6,7 +6,8 @@ require 'snmp/ber'
 
 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::Test
 
   # 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::Test
     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::Test
     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::Test
   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::Test
   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::Test
     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::Test
     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::Test
     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::Test
     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_pdu.rb

@@ -94,9 +94,9 @@ class TestProtocol < Minitest::Test
   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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snmp
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Dave Halliday
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 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