net-snmp 0.1.4 → 0.1.5

data/README.rdoc

@@ -25,11 +25,12 @@ You can use the library in two styles:  synchronously or asynchronously.  If you
 calls will block until a result is returned or the request times out.  If you use the asynchronous style, you
 must provide a block to the client methods, which will be called when the data is ready.
 
-In order for your callbacks to fire, you must call Net::SNMP.dispatcher.  You may pass a timeout argument to
+In order for your callbacks to fire, you must call Net::SNMP::Dispatcher.poll  You may pass a timeout argument to
 the dispatcher.  If you pass false, the call will block forever until data is ready.  If you pass an integer, it will block for
 <timeout> seconds.  If you pass nil (the default), it will do a poll and return immediately.  In that case, you
 will have to arrange for the dispatcher to run periodically.  This can be done in your main event loop or in a
-seperate thread.
+seperate thread.  There are convenience class methods in Net::SNMP::Dispatcher called run_loop, fiber_loop, em_loop, thread_loop
+and so on for setting up various polling loops.  Or, you can roll your own loop.
 
 If you like eventmachine, it's very easy to set up the dispatcher to run periodically in the adaptor.  If you're
 using eventmachine with ruby 1.9, the library uses fibers behind the scenes to turn your synchronous calls into asynchronous
@@ -57,36 +58,16 @@ A simple synchronous SNMP-GET
   result.free    # you have to manually free the memory in sync calls for now.   
 
 An asynchronous SNMP-GET
-
     Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |session|
       session.get(["sysDescr.0", "sysContact.0"]) do |result|
         puts result.varbinds[0].value
       end
     end
-    Net::SNMP.dispatcher(false)  #Setting timeout to false causes dispatcher to block until data is ready
-
-
-Running the dispatcher in a seperate thread
-
-    dispatcher_thread = Thread.new do
-      while Net::SNMP.dispatcher == 0
-        sleep 1
-      end
-    end
-
-    Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
-      s.get(["sysDescr.0", "sysContact.0"]) do |result|
-        puts result.varbinds[0].value
-      end
-    end
-    dispatcher_thread.join
+    Net::SNMP::Dispatcher.poll(false)  #Setting timeout to false causes dispatcher to block until data is ready
 
 Running the dispatcher from eventmachine
     EM.run do
-      tickloop = EM.tick_loop do
-        Net::SNMP.dispatcher
-      end
-
+      Net::SNMP::Dispatcher.em_loop
       Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |session|
         session.get("sysDescr.0") do |result|
           puts result.varbinds[0].value
@@ -96,16 +77,13 @@ Running the dispatcher from eventmachine
 
 Using synchronous style with eventmachine in ruby 1.9
   EM.run do
+      Net::SNMP::Dispatcher.fiber_loop
       Fiber.new {
-        EM.tick_loop do
-          Net::SNMP.dispatcher
-        end
         session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic')
         result = session.get("sysDescr.0")
         puts result.varbinds[0].value
-
+        EM.stop
       }.resume
-      EM.stop
   end
 
 
@@ -128,12 +106,19 @@ Having the appropriate MIBs loaded will allow you to pass names instead of numer
 you can call Net::SNMP.get_oid("sysDescr.0").  For more complex MIB parsing needs, see smi-ffi[http://github.com/mixtli/smi-ffi]
 
 
+== BUGS
+Right now, snmpv3 is only working  using synchronous API.   Asynchronous calls seem to miss packets.
+I have no idea why it would be different for v3 vs v1/v2.  If anyone knows, tell me ;)
+
+
 == CAVEATS/DISCLAIMER
 
 THIS GEM COULD CRASH YOUR SYSTEM AND EAT YOUR CHILDREN!
 
 You have been warned.
 
+The API is subject to change.
+
 This is very much alpha software.  For more information on usage, take a look at the specs.   Currently it's
 only tested against net-snmp 5.5.   The net-snmp api seems pretty stable, but if anything changes, it could
 break this gem.  Please let me know if you find bugs or missing features.  Or better yet, send a pull request.

data/lib/net/snmp/dispatcher.rb

@@ -0,0 +1,103 @@
+class Net::SNMP::Dispatcher
+  class << self
+
+    # timeout = nil  no block(poll),  timeout = false block forever, timeout = int, block int seconds
+    def poll(timeout = nil)
+        fdset = Net::SNMP::Wrapper.get_fd_set
+        num_fds = FFI::MemoryPointer.new(:int)
+        tv_sec = timeout ? timeout.round : 0
+        tv_usec = timeout ? (timeout - timeout.round) * 1000000 : 0
+        tval = Net::SNMP::Wrapper::TimeVal.new(:tv_sec => tv_sec, :tv_usec => tv_usec)
+        block = FFI::MemoryPointer.new(:int)
+
+        if timeout.nil?
+          block.write_int(0)
+        else
+          block.write_int(1)
+        end
+        #puts "calling snmp_select_info"
+        Net::SNMP::Wrapper.snmp_select_info(num_fds, fdset, tval.pointer, block )
+        #puts "done snmp_select_info."
+        num_ready = 0
+        #puts "block = #{block.read_int}"
+
+        #puts "numready = #{num_fds.read_int}"
+        #puts "tv = #{tval[:tv_sec]} #{tval[:tv_usec]}"
+        #puts "timeout = #{timeout}"
+        tv = (timeout == false ? nil : tval)
+        #puts "calling select"
+        #puts "tv = #{tv.inspect}"
+        #puts "calling select with #{num_fds.read_int}"
+        num_ready = Net::SNMP::Wrapper.select(num_fds.read_int, fdset, nil, nil, tv)
+        #puts "done select.  num_ready = #{num_ready}"
+        if num_ready > 0
+          Net::SNMP::Wrapper.snmp_read(fdset)
+        elsif num_ready == 0
+          # timeout.  do something here?  or just return 0?
+        elsif num_ready == -1
+          # error.  check snmp_error?
+        else
+          # uhhh
+        end
+        #puts "done snmp_read"
+        num_ready
+    end
+
+
+    def run_loop(options = {})
+      if defined?(EM) && EM.reactor_running?
+        fiber_loop(options)
+      else
+        thread_loop(options)
+      end
+    end
+
+    # You should not pass nil to this as it will peg your cpu
+    def thread_loop(options = {})
+
+      timeout = options[:timeout] || false
+      sleep_time = options[:sleep]
+      Thread.new do
+        loop do
+          poll(timeout)
+          sleep(sleep_time) if sleep_time
+        end
+      end
+    end
+
+
+    def em_loop(options = {})
+      timeout = options[:timeout]
+      sleep_time = options[:sleep_time] || 0.1
+      myproc = Proc.new do
+        EM.next_tick do
+          while(true) do
+            num_ready = poll(timeout)
+            break if num_ready == 0
+          end
+          EM.add_timer(sleep_time) do
+            myproc.call
+          end
+        end
+      end
+      myproc.call
+    end
+
+    def fiber_loop(options = {})
+      timeout = options[:timeout]
+      sleep_time = options[:sleep] || 0.01
+      Fiber.new {
+        loop do
+          num_handled = poll(timeout)
+          if num_handled == 0
+            f = Fiber.current
+            EM.add_timer(sleep_time) do
+              f.resume
+            end
+            Fiber.yield
+          end
+        end
+      }.resume(nil)
+    end
+  end
+end

data/lib/net/snmp/oid.rb

@@ -21,6 +21,9 @@ module Net
 
       end
 
+      def size
+        @length_pointer.read_int
+      end
       def oid
         @oid
       end

data/lib/net/snmp/pdu.rb

@@ -3,7 +3,7 @@ module Net
     class PDU
       extend Forwardable
       attr_accessor :struct, :varbinds, :callback
-      def_delegators :struct, :reqid, :pointer, :errstat, :errindex, :non_repeaters=
+      def_delegators :struct, :pointer
 
       def initialize(arg)
         @varbinds = []
@@ -38,30 +38,63 @@ module Net
       def max_repetitions
         @struct.errindex
       end
+      def enterprise=(e_oid)
+        @enterprise = e_iod
+        @struct.enterprise = e_oid.pointer
+        @struct.enterprise_length = e_oid.size
+      end
+      def enterprise
+        @enterprise
+      end
+      
+      def agent_addr=(addr)
+        @struct.agent_addr = addr.split('.').pack("CCCC")
+        @agent_addr = addr
+      end
 
+      def agent_addr
+        @agent_addr
+      end
 
-      def add_varbind(options)
 
-        options[:type] ||= case options[:value]
-        when String
-          Constants::ASN_OCTET_STR
-        when nil
-          Constants::ASN_NULL
+      def method_missing(m, *args)
+        if @struct.respond_to?(m)
+          @struct.send(m, *args)
         else
-          raise "Unknown value type"
+          super
         end
+      end
 
+      def add_varbind(options)
+        options[:type] ||= case options[:value]
+          when String
+            Constants::ASN_OCTET_STR
+          when Fixnum
+            Constants::ASN_INTEGER
+          when nil
+            Constants::ASN_NULL
+          else
+            raise "Unknown value type"
+        end
+
+        value = options[:value]
         value_len = case options[:value]
-        when String
-          options[:value].length
-        else
-          0
+          when String
+            options[:value].length
+          when nil
+            0
+          else
+            options[:value].size
         end
 
 
+        if value.respond_to?(:pointer)
+          value = value.pointer
+        end
+
         oid = Net::SNMP::OID.new(options[:oid])
 
-        var_ptr = Wrapper.snmp_pdu_add_variable(@struct.pointer, oid.pointer, oid.length_pointer.read_int, options[:type], options[:value], value_len)
+        var_ptr = Wrapper.snmp_pdu_add_variable(@struct.pointer, oid.pointer, oid.length_pointer.read_int, options[:type], value, value_len)
         varbind = Varbind.new(var_ptr)
         #Wrapper.print_varbind(varbind.struct)
         varbinds << varbind

data/lib/net/snmp/session.rb

@@ -5,6 +5,7 @@ module Net
     class Session
       extend Forwardable
       attr_accessor :struct, :callback
+      attr_reader :version
       def_delegator :@struct, :pointer
       #@sessions = []
       @requests = {}
@@ -25,6 +26,7 @@ module Net
         options[:community_len] = options[:community].length
         options[:version] ||= Constants::SNMP_VERSION_1
         @callback = options[:callback]
+        @version = options[:version] || 1
         #self.class.sessions << self
         @sess = Wrapper::SnmpSession.new(nil)
         Wrapper.snmp_sess_init(@sess.pointer)
@@ -43,7 +45,6 @@ module Net
           Constants::SNMP_VERSION_1
         end
 
-
         if options[:timeout]
           @sess.timeout = options[:timeout] * 1000000
         end
@@ -51,7 +52,6 @@ module Net
           @sess.retries = options[:retries]
         end
 
-
         if @sess.version == Constants::SNMP_VERSION_3
           @sess.securityLevel = options[:security_level] || Constants::SNMP_SEC_LEVEL_NOAUTH
 
@@ -70,7 +70,6 @@ module Net
           if options[:context]
             @sess.contextName = FFI::MemoryPointer.from_string(options[:context])
             @sess.contextNameLen = options[:context].length
-
           end
 
           if options[:username]
@@ -84,13 +83,19 @@ module Net
           unless key_result == Constants::SNMPERR_SUCCESS
             Wrapper.snmp_perror("netsnmp")
           end
-
         end
         
         # General callback just takes the pdu, calls the session callback if any, then the request specific callback.
         @sess.callback = lambda do |operation, session, reqid, pdu_ptr, magic|
-          pdu = Net::SNMP::PDU.new(pdu_ptr)
-          run_callbacks(operation, reqid, pdu, magic)
+          callback.call(operation, reqid, pdu, magic) if callback
+
+          puts "in main callback"
+          if self.class.requests[reqid]
+            puts "got request"
+            pdu = Net::SNMP::PDU.new(pdu_ptr)
+            self.class.requests[reqid].call(pdu)
+            self.class.requests.delete(reqid)
+          end
           0
         end
 
@@ -99,15 +104,6 @@ module Net
         #@struct = Wrapper.snmp_sess_session(@handle)
       end
 
-     
-
-      def run_callbacks(operation, reqid, pdu, magic)
-        callback.call(operation, reqid, pdu, magic) if callback
-        if self.class.requests[reqid]
-          self.class.requests[reqid].call(pdu)
-          self.class.requests.delete(reqid)
-        end        
-      end
 
 
       def get(oidlist, options = {}, &block)
@@ -132,6 +128,7 @@ module Net
         pdu = Net::SNMP::PDU.new(Constants::SNMP_MSG_GETBULK)
         oidlist = [oidlist] unless oidlist.kind_of?(Array)
         oidlist.each do |oid|
+          puts "adding #{oid.inspect}"
           pdu.add_varbind(:oid => oid)
         end
         pdu.non_repeaters = options[:non_repeaters] || 0
@@ -193,6 +190,27 @@ module Net
         results
       end
       
+
+      def default_max_repeaters
+        # We could do something based on transport here.  25 seems safe
+        25
+      end
+
+      def get_columns(columns, options = {})
+        column_oids = columns.map {|c| Net::SNMP::OID.new(c)}
+        options[:max_repetitions] ||= default_max_repeaters / columns.size
+        results = {}
+        if version == 1
+        else
+          while(result = get_bulk(columns, options))
+            result.varbinds.each do |vb|
+              match = column_oids.select {|c| vb.oid.oid =~ /^#{c.oid}/ }
+            end
+          end
+
+        end
+      end
+
       def error(msg)
         Wrapper.snmp_perror("snmp_error")
         Wrapper.snmp_sess_perror( "snmp_error", @sess.pointer)
@@ -200,24 +218,6 @@ module Net
         raise Net::SNMP::Error.new({:session => self}), msg
       end
       
-#      def dispatcher
-#          fdset = Net::SNMP::Wrapper.get_fd_set
-#          num_fds = FFI::MemoryPointer.new(:int)
-#          tval = Net::SNMP::Wrapper::TimeVal.new
-#          block = FFI::MemoryPointer.new(:int)
-#          block.write_int(0)
-#
-#          # Note..  for some reason, snmp_sess_select_info changes block to be 1.
-#          Net::SNMP::Wrapper.snmp_sess_select_info(@handle, num_fds, fdset, tval.pointer, block )
-#          if num_fds.read_int > 0
-#            zero = Wrapper::TimeVal.new(:tv_sec => 0, :tv_usec => 0)
-#            #Wrapper.print_timeval(zero)
-#
-#            num_ready = Net::SNMP::Wrapper.select(num_fds.read_int, fdset, nil, nil, zero.pointer)
-#            Net::SNMP::Wrapper.snmp_sess_read(@handle, fdset)
-#          end
-#      end
-
 
       private
       def send_pdu(pdu, &block)
@@ -252,8 +252,67 @@ module Net
             end
           end
         end
+      end
+
+#      def get_entries_cb(pdu, columns, options)
+#        cache = {}
+#        row_index = nil
+#        varbinds = pdu.varbinds.dup
+#        while(varbinds.size > 0)
+#          row = {}
+#          columns.each do |column|
+#            vb = varbinds.shift
+#            if vb.oid.to_s =~ /#{column.to_s}\.(\d+(:?\.\d+)*)/
+#              index = $1
+#            else
+#              last_entry = true
+#              next
+#            end
+#            row_index = index unless row_index
+#            index_cmp = Net::SNMP.oid_lex_cmp(index, row_index)
+#            if(index_cmp == 0)
+#            end
+#          end
+#        end
+#      end
+
+
+
+
+      def trap(options = {})
+        pdu = PDU.new(Constants::SNMP_MSG_TRAP)
+        options[:enterprise] ||= '1.3.6.1.4.1.3.1.1'  # uh, just send netsnmp enterprise i guess
+        pdu.enterprise = OID.new(options[:enterprise])
+        pdu.trap_type = options[:trap_type] || 1  # need to check all these defaults
+        pdu.specific_type = options[:specific_type] || 0
+        pdu.time = 1    # put what here?
+        send_pdu(pdu)
+      end
 
+
+      def trap_v2(options = {})
+        pdu = PDU.new(Constants::SNMP_MSG_TRAP2)
+        build_trap_pdu(options)
+        send_pdu(pdu)
+      end
+
+      def inform(options = {}, &block)
+        pdu = PDU.new(Constants::SNMP_MSG_INFORM)
+        build_trap_pdu(options)
+        send_pdu(pdu, &block)
+      end
+
+      def build_trap_pdu(pdu, options = {})
+        pdu.add_varbind(:oid => OID.new('sysUpTime'), :type => Constants::ASN_TIMETICKS, :value => 0)
+        pdu.add_varbind(:oid => OID.new('snmpTrapOID'), :type => Constants::ASN_OBJECT_ID, :value => options[:oid])
+        if options[:varbinds]
+          options[:varbinds].each do |vb|
+            pdu.add_varbind(vb)
+          end
+        end
       end
+
+
     end
   end
 end

data/lib/net/snmp/version.rb

@@ -1,5 +1,5 @@
 module Net
   module SNMP
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/net/snmp/wrapper.rb

@@ -251,6 +251,7 @@ module Wrapper
 #  attach_function :netsnmp_oid_tree_equals, [ :pointer, :uint, :pointer, :uint ], :int
   attach_function :netsnmp_oid_is_subtree, [ :pointer, :uint, :pointer, :uint ], :int
   attach_function :netsnmp_oid_find_prefix, [ :pointer, :uint, :pointer, :uint ], :int
+  attach_function :netsnmp_transport_open_client, [:string, :pointer], :pointer
   attach_function :init_snmp, [ :string ], :void
   attach_function :snmp_pdu_build, [ :pointer, :pointer, :pointer ], :pointer
   attach_function :snmpv3_parse, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :int

data/lib/net/snmp.rb

@@ -8,39 +8,11 @@ module Net
       Wrapper.init_snmp(tag)
     end
 
-    # timeout = nil  no block(poll),  timeout = false block forever, timeout = int, block int seconds
-    def self.dispatcher(timeout = nil)
-        fdset = Net::SNMP::Wrapper.get_fd_set
-        num_fds = FFI::MemoryPointer.new(:int)
-        tv_sec = timeout || 0
-        tval = Net::SNMP::Wrapper::TimeVal.new(:tv_sec => tv_sec, :tv_usec => 0)
-        block = FFI::MemoryPointer.new(:int)
-
-        if timeout.nil?
-          block.write_int(0)
-        else
-          block.write_int(1)
-        end
-        #puts "calling snmp_select_info"
-        Net::SNMP::Wrapper.snmp_select_info(num_fds, fdset, tval.pointer, block )
-        #puts "done snmp_select_info."
-        num_ready = 0
-        #puts "block = #{block.read_int}"
-
-        #puts "numready = #{num_fds.read_int}"
-        #puts "tv = #{tval[:tv_sec]} #{tval[:tv_usec]}"
-        if num_fds.read_int > 0
-          tv = timeout == false ? nil : tval
-          #puts "calling select"
-          num_ready = Net::SNMP::Wrapper.select(num_fds.read_int, fdset, nil, nil, tv)
-          #puts "done select.  num_ready = #{num_ready}"
-          Net::SNMP::Wrapper.snmp_read(fdset)
-        else
-        end
-        num_ready
-    end
 
 
+
+    # Some utility methods
+
     def self._get_oid(name)
       oid_ptr = FFI::MemoryPointer.new(:ulong, Constants::MAX_OID_LEN)
       oid_len_ptr = FFI::MemoryPointer.new(:size_t)
@@ -57,6 +29,15 @@ module Net
       oid_ptr.read_array_of_long(oid_len_ptr.read_int).join(".")
     end
 
+    def self.oid_lex_cmp(a,b)
+      [a,b].each do |i|
+        i.sub!(/^\./,'')
+        i.gsub!(/ /, '.0')
+        i.replace(i.split('.').map(&:to_i).pack('N*'))
+      end
+      a <=> b
+    end
+
 
   end
 end

data/lib/net-snmp.rb

@@ -2,7 +2,7 @@ require 'forwardable'
 require 'nice-ffi'
 require 'fiber'
 
-%w(snmp snmp/version snmp/constants snmp/oid snmp/error snmp/pdu snmp/wrapper snmp/session snmp/varbind snmp/mib snmp/mib/node).each do |f|
+%w(snmp snmp/version snmp/constants snmp/oid snmp/error snmp/pdu snmp/wrapper snmp/session snmp/varbind snmp/mib snmp/mib/node snmp/dispatcher).each do |f|
   require "#{File.dirname(__FILE__)}/net/#{f}"
 end
 Net::SNMP::MIB.init

data/net-snmp.gemspec

@@ -5,7 +5,7 @@ $:.unshift lib
 
 Gem::Specification.new do |s|
   s.name        = "net-snmp"
-  s.version     = '0.1.4'
+  s.version     = '0.1.5'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ron McClain"]
   s.email       = ["mixtli@github.com"]

data/spec/async_spec.rb

@@ -0,0 +1,106 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "async" do
+  context "version 1" do
+    it "get should work" do
+      did_callback = false
+      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
+        s.get(["sysDescr.0", "sysContact.0"]) do |result|
+          did_callback = true
+          result.varbinds[0].value.should eql("test.net-snmp.org")
+          result.varbinds[1].value.should match(/Coders/)
+        end
+      end
+      Net::SNMP::Dispatcher.poll(false)
+      did_callback.should be(true)
+    end
+
+    it "getnext should work" do
+     did_callback = false
+      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
+        s.get_next(["sysDescr", "sysContact"]) do |result|
+          did_callback = true
+          result.varbinds[0].value.should eql("test.net-snmp.org")
+          result.varbinds[1].value.should match(/Coders/)
+        end
+      end
+      Net::SNMP::Dispatcher.poll(false)
+      did_callback.should be(true)
+    end
+
+  end
+
+  context "version 2" do
+    it "get should work" do
+      did_callback = false
+      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic', :version => '2c') do |s|
+        s.get(["sysDescr.0", "sysContact.0"]) do |result|
+          did_callback = true
+          result.varbinds[0].value.should eql("test.net-snmp.org")
+          result.varbinds[1].value.should match(/Coders/)
+        end
+      end
+      Net::SNMP::Dispatcher.poll(false)
+      did_callback.should be(true)
+    end
+
+    it "getnext should work" do
+     did_callback = false
+      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic', :version => '2c') do |s|
+        s.get_next(["sysDescr", "sysContact"]) do |result|
+          did_callback = true
+          result.varbinds[0].value.should eql("test.net-snmp.org")
+          result.varbinds[1].value.should match(/Coders/)
+        end
+      end
+      Net::SNMP::Dispatcher.poll(false)
+      did_callback.should be(true)
+    end
+  end
+
+  context "version 3" do
+    #failing intermittently
+    it "should get async using snmpv3" do
+      did_callback = false
+      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :version => 3, :username => 'MD5User',:security_level => Net::SNMP::Constants::SNMP_SEC_LEVEL_AUTHNOPRIV, :auth_protocol => :md5, :password => 'The Net-SNMP Demo Password') do |sess|
+          sess.get(["sysDescr.0"]) do |result|
+            did_callback = true
+            result.varbinds[0].value.should eql('test.net-snmp.org')
+          end
+          sleep(0.5)
+          Net::SNMP::Dispatcher.poll(false)
+          #Net::SNMP::Dispatcher.poll(false)
+          puts "done poll"
+          did_callback.should be(true)
+      end
+    end
+
+
+    it "get should work" do
+      did_callback = false
+      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :version => 3, :username => 'MD5User',:security_level => Net::SNMP::Constants::SNMP_SEC_LEVEL_AUTHNOPRIV, :auth_protocol => :md5, :password => 'The Net-SNMP Demo Password') do |sess|
+        sess.get(["sysDescr.0", "sysContact.0"]) do |result|
+          did_callback = true
+          result.varbinds[0].value.should eql("test.net-snmp.org")
+          result.varbinds[1].value.should match(/Coders/)
+        end
+      end
+      Net::SNMP::Dispatcher.poll(false)
+      did_callback.should be(true)
+    end
+
+    it "getnext should work" do
+      did_callback = false
+
+      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :version => 3, :username => 'MD5User',:security_level => Net::SNMP::Constants::SNMP_SEC_LEVEL_AUTHNOPRIV, :auth_protocol => :md5, :password => 'The Net-SNMP Demo Password') do |sess|
+        sess.get_next(["sysDescr", "sysContact"]) do |result|
+          did_callback = true
+          result.varbinds[0].value.should eql("test.net-snmp.org")
+          result.varbinds[1].value.should match(/Coders/)
+        end
+      end
+      Net::SNMP::Dispatcher.poll(false)
+      did_callback.should be(true)
+    end
+  end
+end

data/spec/em_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "em" do
+  
+  it "should work in event_machine" do
+    require 'eventmachine'
+    did_callback = false
+    EM.run do
+      Net::SNMP::Dispatcher.em_loop
+
+      session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
+        s.get("sysDescr.0") do |result|
+          did_callback = true
+          result.varbinds[0].value.should eql("test.net-snmp.org")
+        end
+      end
+
+      EM.add_timer(3) do
+        did_callback.should be_true
+        EM.stop
+      end
+    end
+  end
+
+
+end

data/spec/fiber_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'eventmachine'
+require 'fiber'
+
+describe "in fiber" do
+
+  def wrap_fiber
+    EM.run do
+      Net::SNMP::Dispatcher.fiber_loop
+      Fiber.new { yield; EM.stop }.resume(nil)
+    end
+  end
+
+
+  it "get should work in a fiber with synchronous calling style" do
+    wrap_fiber do
+        session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic')
+        result = session.get("sysDescr.0")
+        puts "got result = #{result}"
+        result.varbinds[0].value.should eql("test.net-snmp.org")
+    end
+  end
+
+  it "getnext" do
+    wrap_fiber do
+      Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => "demopublic" ) do |sess|
+        result = sess.get_next(["sysUpTimeInstance.0"])
+        result.varbinds.first.oid.oid.should eql("1.3.6.1.2.1.1.4.0")
+        result.varbinds.first.value.should match(/Net-SNMP Coders/)
+      end
+    end
+  end
+
+  it "should get using snmpv3" do
+    wrap_fiber do
+      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :version => 3, :username => 'MD5User', :security_level => Net::SNMP::Constants::SNMP_SEC_LEVEL_AUTHNOPRIV, :auth_protocol => :md5, :password => 'The Net-SNMP Demo Password') do |sess|
+        result = sess.get(["sysDescr.0"])
+        result.varbinds.first.value.should eql('test.net-snmp.org')
+      end
+    end
+  end
+
+end

data/spec/net-snmp_spec.rb

@@ -1,35 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "NetSnmp" do
-  it "should get single oid" do
-    Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => "demopublic" ) do |sess|
-      result = sess.get("sysDescr.0")
-      result.varbinds.first.value.should eql("test.net-snmp.org")
-    end
-  end
-
-  it "should get multiple oids" do
-    Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => 'demopublic' ) do |sess|
-      result = sess.get(["sysDescr.0", "sysName.0"])
-      result.varbinds[0].value.should eql("test.net-snmp.org")
-      result.varbinds[1].value.should eql("test.net-snmp.org")
-    end
-  end
-  
-  it "should get multiple requests asynchronously" do
-    did_callback = false
-    session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
-      s.get(["sysDescr.0", "sysContact.0"]) do |result|
-        did_callback = true
-        result.varbinds[0].value.should eql("test.net-snmp.org")
-        result.varbinds[1].value.should match(/Coders/)
-      end
-    end
-    Net::SNMP.dispatcher(false)
-    did_callback.should be(true)
-  end
-
-
   it "should get an oid asynchronously in a thread" do
     did_callback = false
     session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
@@ -40,7 +11,7 @@ describe "NetSnmp" do
       end
     end
     Thread.new do
-      while Net::SNMP.dispatcher == 0
+      while Net::SNMP::Dispatcher.poll == 0
         sleep 1
       end
     end.join
@@ -48,101 +19,24 @@ describe "NetSnmp" do
   end
 
 
-  it "invalid oid should return error" do
-    Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => "demopublic" ) do |sess|
-      result = sess.get(["XXXsysDescr.0"])  #misspelled
-      result.should be_error
-    end
-  end
-
-  it "should get using snmpv3" do
-    Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :version => 3, :username => 'MD5User', :security_level => Net::SNMP::Constants::SNMP_SEC_LEVEL_AUTHNOPRIV, :auth_protocol => :md5, :password => 'The Net-SNMP Demo Password') do |sess|
-      result = sess.get("sysDescr.0")
-      result.varbinds.first.value.should eql('test.net-snmp.org')
-    end
-  end
-
-  it "should get async using snmpv3" do
-    did_callback = false
-    Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :version => 3, :username => 'MD5User',:security_level => Net::SNMP::Constants::SNMP_SEC_LEVEL_AUTHNOPRIV, :auth_protocol => :md5, :password => 'The Net-SNMP Demo Password') do |sess|
-        sess.get(["sysDescr.0", "sysName.0"]) do |result|
-          did_callback = true
-          result.varbinds[0].value.should eql('test.net-snmp.org')
-          result.varbinds[1].value.should eql('test.net-snmp.org')
-          0
-        end
-        sleep(1)
-        Net::SNMP.dispatcher()
-        did_callback.should be(true)
-    end
-  end
-  
-  
-  # To test sets, you have to have a local snmpd running with write permissions
-  it "should set a value" do
-    Net::SNMP::Session.open(:peername => '127.0.0.1', :version => 1) do |sess|
-      result = sess.set([['sysContact.0', Net::SNMP::Constants::ASN_OCTET_STR, 'yomama']])
-      result.varbinds.first.value.should match(/yomama/)
-      result.should_not be_error
-    end
-  end
-     
-  #it "should set using snmpv3" do
-  #  pending
-  #  Net::SNMP::Session.open(:peername => '127.0.0.1', :version => 3, :username => 'myuser', :authprotocol => :sha1, :authkey => '0x1234', :privprotocol => :des, :privkey => '0x25252') do |sess|
-  #    result = sess.set([["sysDescr.0", Net::SNMP::Constants::ASN_OCTET_STR, 'yomama']])
-  #    result.varbinds.first.value.should match(/Darwin/)
-  #  end
-  #end
-  
-  it "should get next an array of oids" do
-    Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => "demopublic" ) do |sess|
-      result = sess.get_next(["sysUpTimeInstance.0"])
-      result.varbinds.first.oid.oid.should eql("1.3.6.1.2.1.1.4.0")
-      result.varbinds.first.value.should match(/Net-SNMP Coders/)
-    end
-  end
-  
+#  it "should get columns" do
+#    Net::SNMP::Session.open(:peername => 'localhost', :version => '2c', :community => 'public') do |sess|
+#      result = sess.get_columns(['ifIndex', 'ifInOctets', 'ifOutOctets'])
+#      result.size.should eql(7)
+#      result['1']['ifIndex'].should eql('1')
+#      result['2']['ifInOctets'].should be > 10
+#    end
+#  end
 
-  it "should get_bulk_request" do
-    Net::SNMP::Session.open(:peername => "test.net-snmp.org" , :version => '2c', :community => 'demopublic') do |sess|
-      result = sess.get_bulk(["sysContact.0"], :max_repetitions => 10)
-      result.varbinds.first.oid.name.should eql("1.3.6.1.2.1.1.5.0")
-      result.varbinds.first.value.should eql("test.net-snmp.org")
-    end
-  end
-  
-  it "should get a table of values with explicit columns" do
-    session = Net::SNMP::Session.open(:peername => "localhost", :version => '2c')
-    table = session.get_table("ifTable", :columns => ["ifIndex", "ifDescr", "ifName"])
-    table[0]['ifName'].should eql("lo0")
-    table[1]['ifName'].should eql("gif0")
-  end
 
-  it "should get a table of values" do
-    session = Net::SNMP::Session.open(:peername => "localhost", :version => '2c')
-    table = session.get_table("ifEntry")
-    table[0]['ifIndex'].should eql(1)
-    table[1]['ifIndex'].should eql(2)
+  it "should compare oids" do
+    Net::SNMP.oid_lex_cmp('1.3.5', '1.3.7').should eql(-1)
+    Net::SNMP.oid_lex_cmp('1.3.7', '1.3.5').should eql(1)
+    Net::SNMP.oid_lex_cmp('1.3.7', '1.3.7.1').should eql(-1)
+    Net::SNMP.oid_lex_cmp('1.3.5', '1.3.5').should eql(0)
   end
 
-  it "should get a table of values ipAddrEntry" do
-    puts Net::SNMP::Constants::ASN_IPADDRESS
-    session = Net::SNMP::Session.open(:peername => "localhost", :version => '2c')
-    table = session.get_table("ipAddrEntry")
-    puts table.inspect
-    table[0]['ipAdEntAddr'].should eql('127.0.0.1')
-    table[1]['ipAdEntNetMask'].should eql('255.255.255.0')
-  end
 
-  it "should get a table of values ifXEntry" do
-    puts Net::SNMP::Constants::ASN_IPADDRESS
-    session = Net::SNMP::Session.open(:peername => "localhost", :version => '2c')
-    table = session.get_table("ifXEntry")
-    puts table.inspect
-    table[0]['ifName'].should eql('lo0')
-    table[3]['ifHighSpeed'].should eql(1000)
-  end
 
   it "should translate an oid" do
 
@@ -154,74 +48,9 @@ describe "NetSnmp" do
 
 
 
-  it "should work in event_machine" do
-    require 'eventmachine'
-    did_callback = false
-    EM.run do
-      tickloop = EM.tick_loop do
-        Net::SNMP.dispatcher
-      end
 
-      session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
-        s.get("sysDescr.0") do |result|
-          did_callback = true
-          result.varbinds[0].value.should eql("test.net-snmp.org")
-        end
-        
-      end
 
-      EM.add_timer(3) do
-        did_callback.should be_true
-        EM.stop
-      end
-    end
-  end
-
-  it "should work in a fiber" do
-    require 'eventmachine'
-    did_callback = false
-    EM.run do
-      tickloop = EM.tick_loop do
-        Net::SNMP.dispatcher
-      end
 
-      Fiber.new {
-        session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
-          s.get("sysDescr.0") do |result|
-            did_callback = true
-            result.varbinds[0].value.should eql("test.net-snmp.org")
-          end
-
-        end
-
-        EM.add_timer(3) do
-          did_callback.should eql(true)
-          EM.stop
-        end
-      }.resume
-    end
-  end
-
-
-
-  it "get should work in a fiber with synchronous calling style" do
-    require 'eventmachine'
-    did_callback = false
-    EM.run do
-      Fiber.new {
-
-        EM.tick_loop do
-
-          Net::SNMP.dispatcher
-        end
-        sleep 1
-        session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic')
-        result = session.get("sysDescr.0")
-        result.varbinds[0].value.should eql("test.net-snmp.org")
-      }.resume
-      EM.stop
-    end
-  end
 
 
 end

data/spec/sync_spec.rb

@@ -0,0 +1,95 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "synchronous calls" do
+  # To test sets, you have to have a local snmpd running with write permissions
+  context "version 1" do
+    it "get should succeed" do
+      Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => "demopublic" ) do |sess|
+        result = sess.get("sysDescr.0")
+        result.varbinds.first.value.should eql("test.net-snmp.org")
+      end
+    end
+
+    it "get should succeed with multiple oids" do
+      Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => 'demopublic' ) do |sess|
+        result = sess.get(["sysDescr.0", "sysName.0"])
+        result.varbinds[0].value.should eql("test.net-snmp.org")
+        result.varbinds[1].value.should eql("test.net-snmp.org")
+      end
+    end
+
+    it "set should succeed" do
+      Net::SNMP::Session.open(:peername => '127.0.0.1', :version => 1) do |sess|
+        result = sess.set([['sysContact.0', Net::SNMP::Constants::ASN_OCTET_STR, 'yomama']])
+        result.varbinds.first.value.should match(/yomama/)
+        result.should_not be_error
+      end
+    end
+
+    it "getnext should succeed" do
+      Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => "demopublic" ) do |sess|
+        result = sess.get_next(["sysUpTimeInstance.0"])
+        result.varbinds.first.oid.oid.should eql("1.3.6.1.2.1.1.4.0")
+        result.varbinds.first.value.should match(/Net-SNMP Coders/)
+      end
+    end
+
+
+    it "getbulk should succeed" do
+      Net::SNMP::Session.open(:peername => "test.net-snmp.org" , :version => '2c', :community => 'demopublic') do |sess|
+        result = sess.get_bulk(["sysContact.0"], :max_repetitions => 10)
+        result.varbinds.first.oid.name.should eql("1.3.6.1.2.1.1.5.0")
+        result.varbinds.first.value.should eql("test.net-snmp.org")
+      end
+    end
+
+    it "getbulk should succeed with multiple oids" do
+      Net::SNMP::Session.open(:peername => "localhost" , :version => '2c', :community => 'public') do |sess|
+        result = sess.get_bulk(["ifInOctets", 'ifOutOctets', 'ifInErrors', 'ifOutErrors'], :max_repeaters =>10)
+        result.varbinds.size.should eql(40)
+      end
+    end
+
+    it "get should return error with invalid oid" do
+      Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => "demopublic" ) do |sess|
+        result = sess.get(["XXXsysDescr.0"])  #misspelled
+        result.should be_error
+      end
+    end
+
+    it "get_table should work with multiple columns" do
+      session = Net::SNMP::Session.open(:peername => "localhost", :version => '1')
+      table = session.get_table("ifTable", :columns => ["ifIndex", "ifDescr", "ifName"])
+      table[0]['ifName'].should eql("lo0")
+      table[1]['ifName'].should eql("gif0")
+    end
+
+    it "get_table should work" do
+      session = Net::SNMP::Session.open(:peername => "localhost", :version => '1')
+      table = session.get_table("ifEntry")
+      table[0]['ifIndex'].should eql(1)
+      table[1]['ifIndex'].should eql(2)
+    end
+
+  end
+
+  context "version 2" do
+    
+  end
+
+  context "version 3" do
+    it "should get using snmpv3" do
+      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :version => 3, :username => 'MD5User', :security_level => Net::SNMP::Constants::SNMP_SEC_LEVEL_AUTHNOPRIV, :auth_protocol => :md5, :password => 'The Net-SNMP Demo Password') do |sess|
+        result = sess.get("sysDescr.0")
+        result.varbinds.first.value.should eql('test.net-snmp.org')
+      end
+    end
+    #it "should set using snmpv3" do
+    #  pending
+    #  Net::SNMP::Session.open(:peername => '127.0.0.1', :version => 3, :username => 'myuser', :authprotocol => :sha1, :authkey => '0x1234', :privprotocol => :des, :privkey => '0x25252') do |sess|
+    #    result = sess.set([["sysDescr.0", Net::SNMP::Constants::ASN_OCTET_STR, 'yomama']])
+    #    result.varbinds.first.value.should match(/Darwin/)
+    #  end
+    #end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ron McClain
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -05:00
+date: 2011-04-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - lib/net-snmp.rb
 - lib/net/snmp.rb
 - lib/net/snmp/constants.rb
+- lib/net/snmp/dispatcher.rb
 - lib/net/snmp/error.rb
 - lib/net/snmp/inline.rb
 - lib/net/snmp/mib.rb
@@ -80,9 +81,13 @@ files:
 - lib/net/snmp/version.rb
 - lib/net/snmp/wrapper.rb
 - net-snmp.gemspec
+- spec/async_spec.rb
+- spec/em_spec.rb
+- spec/fiber_spec.rb
 - spec/mib_spec.rb
 - spec/net-snmp_spec.rb
 - spec/spec_helper.rb
+- spec/sync_spec.rb
 - spec/wrapper_spec.rb
 has_rdoc: true
 homepage: ""
@@ -117,7 +122,11 @@ signing_key:
 specification_version: 3
 summary: Object oriented wrapper around C net-snmp libraries
 test_files: 
+- spec/async_spec.rb
+- spec/em_spec.rb
+- spec/fiber_spec.rb
 - spec/mib_spec.rb
 - spec/net-snmp_spec.rb
 - spec/spec_helper.rb
+- spec/sync_spec.rb
 - spec/wrapper_spec.rb