netsnmp 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48d02a452a0dee151b936f9e8ff6af2c0c305f6a235a42a23ce5426a5dcd33f2
-  data.tar.gz: 05b2efdcbac79cba8d4e749dca163446fab1214c355a609c3e855762af1018a5
+  metadata.gz: f6e597be5bb67ffec6821029f1f7f8dc94532c4a9c1398bfef974922c3f0f6cf
+  data.tar.gz: 3ddbf95ad3c480e8960e7501511c7ddd3c43b38386226783e8bb110811041a9c
 SHA512:
-  metadata.gz: a26c9601d225cb1a3008a11890955acf1372fafba39e07ea4eed8f70969fd22ebdacd655ddafbf62681ba4dd1d95159e2b348fd627dc8063e9c6c8f5f244579a
-  data.tar.gz: 3d0a6cfac763709d76cfc83b3d3d38261be9cb84d144a58267b3135a46b98418dd1cf882b5ff0866fabd1c74b59a82f641bbaad49387cbfc3a9d49242ef323b1
+  metadata.gz: bff2dc9d8641545bebce2fafc68ded21f282ca5fe68eb07fbeb0aac66333a25c50f871468b6a442a90777c0eacccd3145426bc2c1c7c4cd23ff8f409e80f6135
+  data.tar.gz: 6643a5b5c3275ad9db55cad071b42b7cd423b5896786718ad4cfc8ac224e3c1b56e8c8c36b803db7b60e906d3981502e92256d8b63ba692d60333f026147754b

data/.rubocop_todo.yml

@@ -11,7 +11,7 @@ Metrics/BlockLength:
 
 # Offense count: 17
 Metrics/AbcSize:
-  Max: 27
+  Max: 100
 
 # Offense count: 2
 # Configuration parameters: CountComments.
@@ -25,7 +25,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 22
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 30
+  Max: 50
 
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs.

data/.travis.yml

@@ -8,7 +8,7 @@ before_install:
   - sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y docker-ce
 
 install:
-  - gem update --system
+  - gem i rubygems-update -v '<3' && update_rubygems
   - bundle install --path .bundle
 
 script:
@@ -21,6 +21,7 @@ rvm:
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
   - ruby-head
   - jruby-head
   - rbx-2

data/README.md

@@ -123,6 +123,8 @@ If you create an `IPAddr` object (ruby standard library `ipaddr`) and pass it to
 The `NETSNMP::Timeticks` type is internal to this library, but it is a ruby `Numeric` type. You are safe to use it "as a numeric", that is, perform calculations.
 
 
+Counter32 and Counter64 types will map to plain integers.
+
 You can find usage examples [here](https://github.com/swisscom/ruby-netsnmp/blob/master/spec/varbind_spec.rb). If you need support to a missing type, you have the following options:
 
 * Use the `:type` parameter in `#set` calls:

data/lib/netsnmp/varbind.rb

@@ -91,7 +91,15 @@ module NETSNMP
                      return Timetick.new(value).to_asn
                    when :opaque then 4
                    when :nsap then 5
-                   when :counter64 then 6
+                   when :counter64
+                     asn_val = [
+                       (value >> 96) & 0xFFFFFFFF,
+                       (value >> 64) & 0xFFFFFFFF,
+                       (value >> 32) & 0xFFFFFFFF,
+                       value & 0xFFFFFFFF
+                     ].pack("NNNN")
+                     asn_val = asn_val[1..-1] while asn_val.start_with?("\x00")
+                     6
                    when :uinteger then 7
                    else
                      raise Error, "#{typ}: unsupported application type"
@@ -108,12 +116,15 @@ module NETSNMP
            2 # gauge
         val = asn.value
         val.prepend("\x00") while val.bytesize < 4
-        asn.value.unpack("N*")[0] || 0
+        val.unpack("N*")[0] || 0
       when 3 # timeticks
         Timetick.new(asn.value.unpack("N*")[0] || 0)
         # when 4 # opaque
         # when 5 # NSAP
-        # when 6 # ASN Counter 64
+      when 6 # ASN Counter 64
+        val = asn.value
+        val.prepend("\x00") while val.bytesize % 16 != 0
+        val.unpack("NNNN").reduce(0) { |sum, elem| (sum << 32) + elem }
         # when 7 # ASN UInteger
       end
     end

data/lib/netsnmp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NETSNMP
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/varbind_spec.rb

@@ -9,27 +9,62 @@ RSpec.describe NETSNMP::Varbind do
         ipaddr = IPAddr.new("10.11.104.2")
         varbind = described_class.new(".1.3.6.1.4.1.2011.6.3.1.1.0", value: ipaddr)
         expect(varbind.to_der).to end_with("@\x04\n\vh\x02".b)
+        asn = varbind.to_asn.value.last
+        expect(varbind.convert_application_asn(asn)).to eq(ipaddr)
       end
       it "converts custom timeticks" do
         timetick = NETSNMP::Timetick.new(1) # yes, one timetick
         varbind = described_class.new(".1.3.6.1.2.1.1.3.0", value: timetick)
         expect(varbind.to_der).to end_with("\x04\x00\x00\x00\x01".b) # ends with an octet string rep of 1 timetick
+        asn = varbind.to_asn.value.last
+        expect(varbind.convert_application_asn(asn)).to eq(timetick)
       end
       context "when passed a type" do
         it "converts gauge32" do
           gauge = 805
           varbind = described_class.new(".1.3.6.1.2.1.1.3.0", type: :gauge, value: gauge)
           expect(varbind.to_der).to end_with("B\x02\x03%".b)
+          asn = varbind.to_asn.value.last
+          expect(varbind.convert_application_asn(asn)).to eq(gauge)
         end
         it "converts counter32" do
-          gauge = 998932
-          varbind = described_class.new(".1.3.6.1.2.1.1.3.0", type: :counter32, value: gauge)
+          counter = 998932
+          varbind = described_class.new(".1.3.6.1.2.1.1.3.0", type: :counter32, value: counter)
           expect(varbind.to_der).to end_with("\x0F>\x14".b)
+          asn = varbind.to_asn.value.last
+          expect(varbind.convert_application_asn(asn)).to eq(counter)
+        end
+        it "converts counter64" do
+          counter = 998932
+          varbind = described_class.new(".1.3.6.1.2.1.1.3.0", type: :counter64, value: counter)
+          expect(varbind.to_der).to end_with("\x0F>\x14".b)
+          asn = varbind.to_asn.value.last
+          expect(varbind.convert_application_asn(asn)).to eq(counter)
+
+          counter = 4294967296
+          varbind = described_class.new(".1.3.6.1.2.1.1.3.0", type: :counter64, value: counter)
+          expect(varbind.to_der).to end_with("\x01\x00\x00\x00\x00".b)
+          asn = varbind.to_asn.value.last
+          expect(varbind.convert_application_asn(asn)).to eq(counter)
+
+          counter = 309084502
+          varbind = described_class.new(".1.3.6.1.2.1.1.3.0", type: :counter64, value: counter)
+          expect(varbind.to_der).to include("F\x04".b)
+          asn = varbind.to_asn.value.last
+          expect(varbind.convert_application_asn(asn)).to eq(counter)
+
+          counter = 2_613_579_752_238
+          varbind = described_class.new(".1.3.6.1.2.1.1.3.0", type: :counter64, value: counter)
+          expect(varbind.to_der).to include("F\x06".b)
+          asn = varbind.to_asn.value.last
+          expect(varbind.convert_application_asn(asn)).to eq(counter)
         end
         it "converts integer ticks" do
           timetick = 1
           varbind = described_class.new(".1.3.6.1.2.1.1.3.0", type: :timetick, value: timetick)
           expect(varbind.to_der).to end_with("\x04\x00\x00\x00\x01".b)
+          asn = varbind.to_asn.value.last
+          expect(varbind.convert_application_asn(asn)).to eq(timetick)
         end
       end
     end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: netsnmp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - net-snmp
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: SNMP Client library