netsnmp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dcad05ae1ce9ca55fc653ab0f11d97887229b2e
-  data.tar.gz: e3bdc4c01e957884fea362c5b6a9c0ba79221ee0
+  metadata.gz: 8014fd377e09fcd49d70da331116b3d66bce52e3
+  data.tar.gz: 9038971c4dd91219e581ddfdfa11d64b062790bf
 SHA512:
-  metadata.gz: 6557ae719bc1492de34849ed911aee5c5d7bdb246eefec39295ec6cc6e61d42dc39f6fc561d375e7edb76c6cf34f0dc5fcbec9d83fd22955a02e290caf7cb13e
-  data.tar.gz: 1a3599d249d30381276e0aea4c8317ab0e288a97bc5b8cff7fba787d7f8e0dc5f09148f05e9ac40bdf7ae8018d5d8741316d3eacd333dce90de245e984140fc4
+  metadata.gz: b1469577a0aa7719c12fa54eb445b4016f3e44b3caa2d51db8931b18f852256af0482261feeff407e195c0af2cf72d3ddb477ca6062b529f9dd0748e1dd2ffcc
+  data.tar.gz: 31a013f21505b92217c276b33631c52c0cb42c9d493a24b51a3bd190304f4ac67c3a1e921fa59f6f432f8f5b4b6248f68e65581ef4f2c2f7f044968bda57a4ae

data/lib/netsnmp.rb

@@ -58,6 +58,8 @@ end
 
 require "netsnmp/errors"
 
+require "netsnmp/timeticks"
+
 require "netsnmp/oid"
 require "netsnmp/varbind"
 require "netsnmp/pdu"

data/lib/netsnmp/timeticks.rb

@@ -0,0 +1,70 @@
+module NETSNMP
+  class Timetick < Numeric
+
+    # @param [Integer] ticks number of microseconds since the time it was read
+    def initialize(ticks)
+      @ticks = ticks
+    end
+
+
+    def to_s
+      days = days_since
+      hours = hours_since(days)
+      minutes = minutes_since(hours)
+      milliseconds = milliseconds_since(minutes)
+      "Timeticks: (#{@ticks}) #{days.to_i} days, #{hours.to_i}:#{minutes.to_i}:#{milliseconds.to_f.round(2)}"
+    end
+
+    def to_i
+      @ticks
+    end
+
+    def to_asn
+      OpenSSL::ASN1::ASN1Data.new([@ticks].pack("N"), 3, :APPLICATION)
+    end
+
+    def coerce(other)
+      [ Timetick.new(other), self]
+    end
+
+    def <=>(other)
+      to_i <=> other.to_i
+    end
+
+    def +(other)
+      Timetick.new( (to_i + other.to_i))
+    end
+
+    def -(other)
+      Timetick.new( (to_i - other.to_i))
+    end
+
+    def *(other)
+      Timetick.new( (to_i * other.to_i))
+    end
+
+    def /(other)
+      Timetick.new( (to_i / other.to_i))
+    end
+
+    private
+
+
+    def days_since
+      Rational(@ticks, 8_640_000)
+    end
+
+    def hours_since(days)
+      Rational((days.to_f - days.to_i) * 24)
+    end
+
+    def minutes_since(hours)
+      Rational((hours.to_f - hours.to_i) * 60)
+    end
+      
+    def milliseconds_since(minutes)
+      Rational((minutes.to_f - minutes.to_i) * 60)
+    end
+
+  end
+end

data/lib/netsnmp/varbind.rb

@@ -23,8 +23,7 @@ module NETSNMP
     def to_asn
       asn_oid = OID.to_asn(@oid)
       asn_val = if @type
-        asn_type, asn_val = convert_to_asn(@type, @value)
-        OpenSSL::ASN1::ASN1Data.new(asn_val, asn_type, :APPLICATION)
+        convert_to_asn(@type, @value)
       else
         case @value
         when String
@@ -37,6 +36,8 @@ module NETSNMP
           OpenSSL::ASN1::Null.new(nil)
         when IPAddr
           OpenSSL::ASN1::ASN1Data.new(@value.hton, 0, :APPLICATION)
+        when Timetick
+          @value.to_asn
         else
           raise Error, "#{@value}: unsupported varbind type"
         end
@@ -74,17 +75,24 @@ module NETSNMP
     end
 
     def convert_to_asn(typ, value)
-      return [typ, value] unless typ.is_a?(Symbol)
-      case typ
-        when :ipaddress then 0
-        when :counter32 then 1
-        when :gauge then 2
-        when :timetick then [3, [ value].pack("N") ]
-        when :opaque then 4
-        when :nsap then 5
-        when :counter64 then 6
-        when :uinteger then 7
+      asn_type = typ
+      asn_val = value
+      if typ.is_a?(Symbol)
+        asn_type = case typ
+          when :ipaddress then 0
+          when :counter32 then 1
+          when :gauge then 2
+          when :timetick
+            return Timetick.new(value).to_asn
+          when :opaque then 4
+          when :nsap then 5
+          when :counter64 then 6
+          when :uinteger then 7
+          else  
+            raise Error, "#{typ}: unsupported application type"
+        end
       end
+      OpenSSL::ASN1::ASN1Data.new(asn_val, asn_type, :APPLICATION)
     end
 
     def convert_application_asn(asn)
@@ -95,7 +103,7 @@ module NETSNMP
           asn.value.unpack("n*")[0] || 0
         when 2 # gauge
         when 3 # timeticks
-          asn.value.unpack("N*")[0] || 0
+          Timetick.new(asn.value.unpack("N*")[0] || 0)
         when 4 # opaque
         when 5 # NSAP
         when 6 # ASN Counter 64

data/lib/netsnmp/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module NETSNMP
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/client_spec.rb

@@ -22,12 +22,12 @@ RSpec.describe NETSNMP::Client do
       let(:walk_result) { <<-WALK
 1.3.6.1.2.1.1.1.0: Device description
 1.3.6.1.2.1.1.2.0: 1.3.6.1.4.1.3454
-1.3.6.1.2.1.1.3.0: 78171676
+1.3.6.1.2.1.1.3.0: Timeticks: (78171676) 9 days, 1:8:36.76
 1.3.6.1.2.1.1.4.0: The Owner
 1.3.6.1.2.1.1.5.0: DEVICE-192.168.1.1
 1.3.6.1.2.1.1.6.0: The Cloud
 1.3.6.1.2.1.1.7.0: 72
-1.3.6.1.2.1.1.8.0: 0
+1.3.6.1.2.1.1.8.0: Timeticks: (0) 0 days, 0:0:0.0
 WALK
       }
       let(:set_oid_result) { 43 }
@@ -48,12 +48,12 @@ WALK
       let(:walk_result) { <<-WALK
 1.3.6.1.2.1.1.1.0: Device description
 1.3.6.1.2.1.1.2.0: 1.3.6.1.4.1.3454
-1.3.6.1.2.1.1.3.0: 78171676
+1.3.6.1.2.1.1.3.0: Timeticks: (78171676) 9 days, 1:8:36.76
 1.3.6.1.2.1.1.4.0: The Owner
 1.3.6.1.2.1.1.5.0: DEVICE-192.168.1.1
 1.3.6.1.2.1.1.6.0: The Cloud
 1.3.6.1.2.1.1.7.0: 72
-1.3.6.1.2.1.1.8.0: 0
+1.3.6.1.2.1.1.8.0: Timeticks: (0) 0 days, 0:0:0.0
 WALK
       }
       let(:set_oid_result) { 43 }

data/spec/timeticks_spec.rb

@@ -0,0 +1,12 @@
+# from https://ask.wireshark.org/questions/14002/how-to-decode-timeticks-hundreds-seconds-to-readable-date-time
+RSpec.describe NETSNMP::Timetick do
+  subject { described_class.new(1525917187) }
+
+  describe "as an integer" do
+    it { expect((1 + subject).to_i).to be(1525917188) }
+  end
+
+  describe "as an embedded string" do
+    it { expect(subject.to_s).to eq("Timeticks: (1525917187) 176 days, 14:39:31.87") }
+  end
+end

data/spec/varbind_spec.rb

@@ -8,6 +8,19 @@ RSpec.describe NETSNMP::Varbind do
         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)
       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
+      end
+      context "when passed a type" do
+        # TODO: tidy this for IP Addresses
+        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)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netsnmp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,6 +99,7 @@ files:
 - lib/netsnmp/scoped_pdu.rb
 - lib/netsnmp/security_parameters.rb
 - lib/netsnmp/session.rb
+- lib/netsnmp/timeticks.rb
 - lib/netsnmp/v3_session.rb
 - lib/netsnmp/varbind.rb
 - lib/netsnmp/version.rb
@@ -115,6 +116,7 @@ files:
 - spec/support/request_examples.rb
 - spec/support/start_docker.sh
 - spec/support/stop_docker.sh
+- spec/timeticks_spec.rb
 - spec/v3_session_spec.rb
 - spec/varbind_spec.rb
 homepage: ''
@@ -156,5 +158,6 @@ test_files:
 - spec/support/request_examples.rb
 - spec/support/start_docker.sh
 - spec/support/stop_docker.sh
+- spec/timeticks_spec.rb
 - spec/v3_session_spec.rb
 - spec/varbind_spec.rb