net-snmp 0.1.5 → 0.1.6

data/README.rdoc

@@ -42,10 +42,7 @@ functions are defined in Net::SNMP::Wrapper.  You can call them like so:
   Net::SNMP::Wrapper.snmp_perror("some_error")
 
 == NOTES
-  For now, you have to free the pdu when you're done with it in sync calls or you'll leak memory.
-It's not necessary in async calls because the library automatically frees the pdu after the callback fires.
-This is where destructors would be handy.
-
+You must call Session.close when you're done with a session to avoid leaking memory
 
 == EXAMPLES
 
@@ -55,24 +52,29 @@ A simple synchronous SNMP-GET
   session = Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => "demopublic" )
   result = session.get("sysDescr.0")
   puts result.varbinds.first.value
-  result.free    # you have to manually free the memory in sync calls for now.   
+  session.close
 
 An asynchronous SNMP-GET
-    Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |session|
+    session = 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.poll(false)  #Setting timeout to false causes dispatcher to block until data is ready
+    session.close
 
 Running the dispatcher from eventmachine
     EM.run do
       Net::SNMP::Dispatcher.em_loop
-      Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |session|
+      session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |session|
         session.get("sysDescr.0") do |result|
           puts result.varbinds[0].value
         end
       end
+      EM.add_timer(2) do
+        session.close
+        EM.stop
+      end
     end
 
 Using synchronous style with eventmachine in ruby 1.9
@@ -82,6 +84,7 @@ Using synchronous style with eventmachine in ruby 1.9
         session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic')
         result = session.get("sysDescr.0")
         puts result.varbinds[0].value
+        session.close
         EM.stop
       }.resume
   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 snmp/dispatcher).each do |f|
+%w(snmp snmp/version snmp/constants snmp/utility 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/lib/net/snmp.rb

@@ -11,33 +11,6 @@ module Net
 
 
 
-    # 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)
-      oid_len_ptr.write_int(Constants::MAX_OID_LEN)
-
-      if !Wrapper.snmp_parse_oid(name, oid_ptr, oid_len_ptr)
-        Wrapper.snmp_perror(name)
-      end
-      [oid_ptr, oid_len_ptr]
-    end
-
-    def self.get_oid(name)
-      oid_ptr, oid_len_ptr = _get_oid(name)
-      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/dispatcher.rb

@@ -2,48 +2,70 @@ 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)
+#    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 = RubyWrapper.rb_thread_select(num_fds.read_int, fdset, nil, nil, tv)
+#        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
 
-        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
+    def poll(timeout = nil)
+      puts "Dispatcher.poll #{Net::SNMP::Session.sessions.size}"
+      total = 0
+      t = timeout
+      t = nil if t == false
+      catch :got_data do
+        loop do
+          Net::SNMP::Session.lock.synchronize {
+            Net::SNMP::Session.sessions.each do |k, sess|
+              puts "polling session"
+              total += sess.poll(t)
+            end
+          }
+          throw :got_data if total > 0
+          throw :got_data unless timeout == false
         end
-        #puts "done snmp_read"
-        num_ready
+      end
+      puts "Done Dispatcher.poll"
+      total
     end
 
-
     def run_loop(options = {})
       if defined?(EM) && EM.reactor_running?
         fiber_loop(options)
@@ -55,12 +77,16 @@ class Net::SNMP::Dispatcher
     # 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]
+      timeout = options[:timeout] || 0.1
+      sleep_time = options[:sleep] || 0.1
       Thread.new do
         loop do
-          poll(timeout)
-          sleep(sleep_time) if sleep_time
+          puts "polling"
+          num_ready = poll(timeout)
+          puts "num_ready = #{num_ready}"
+          if num_ready == 0
+            sleep(sleep_time) if sleep_time
+          end
         end
       end
     end
@@ -85,7 +111,7 @@ class Net::SNMP::Dispatcher
 
     def fiber_loop(options = {})
       timeout = options[:timeout]
-      sleep_time = options[:sleep] || 0.01
+      sleep_time = options[:sleep] || 0.1
       Fiber.new {
         loop do
           num_handled = poll(timeout)

data/lib/net/snmp/oid.rb

@@ -16,7 +16,7 @@ module Net
           if Wrapper.get_node(@oid, @pointer, @length_pointer) == 0
             Wrapper.snmp_perror(@oid)
           end
-          @oid = c_oid
+          @oid = to_s
         end
 
       end
@@ -32,7 +32,7 @@ module Net
         @oid
       end
 
-      def c_oid
+      def to_s
         @pointer.read_array_of_long(length_pointer.read_int).join(".")
       end
 

data/lib/net/snmp/session.rb

@@ -1,29 +1,42 @@
+require 'thread'
 require 'forwardable'
 require 'pp'
 module Net
   module SNMP
     class Session
       extend Forwardable
-      attr_accessor :struct, :callback
+      attr_accessor :struct, :callback, :requests, :peername, :community
       attr_reader :version
       def_delegator :@struct, :pointer
       #@sessions = []
-      @requests = {}
+      @lock = Mutex.new
+      @sessions = {}
+
       class << self
-        attr_accessor :requests
+        attr_accessor :sessions, :lock
         def open(options = {})
+          puts "building session"
           session = new(options)
+          @lock.synchronize {
+            @sessions[session.sessid] = session
+          }
+          puts "done building"
           if block_given?
+            puts "calling block"
             yield session
+
           end
           session
         end
       end
 
       def initialize(options = {})
-        options[:peername] ||= 'localhost'
-        options[:community] ||= "public"
-        options[:community_len] = options[:community].length
+        puts "in initialize"
+        @requests = {}
+        @peername = options[:peername] || 'localhost'
+        @community = options[:community] || "public"
+        options[:community_len] = @community.length
+        @version = options[:version] || 1
         options[:version] ||= Constants::SNMP_VERSION_1
         @callback = options[:callback]
         @version = options[:version] || 1
@@ -31,9 +44,9 @@ module Net
         @sess = Wrapper::SnmpSession.new(nil)
         Wrapper.snmp_sess_init(@sess.pointer)
         #options.each_pair {|k,v| ptr.send("#{k}=", v)}
-        @sess.community = FFI::MemoryPointer.from_string(options[:community])
-        @sess.community_len = options[:community].length
-        @sess.peername = FFI::MemoryPointer.from_string(options[:peername])
+        @sess.community = FFI::MemoryPointer.from_string(@community)
+        @sess.community_len = @community.length
+        @sess.peername = FFI::MemoryPointer.from_string(@peername)
         @sess.version = case options[:version].to_s
         when '1'
           Constants::SNMP_VERSION_1
@@ -51,7 +64,7 @@ module Net
         if options[:retries]
           @sess.retries = options[:retries]
         end
-
+        puts "1"
         if @sess.version == Constants::SNMP_VERSION_3
           @sess.securityLevel = options[:security_level] || Constants::SNMP_SEC_LEVEL_NOAUTH
 
@@ -84,27 +97,35 @@ module Net
             Wrapper.snmp_perror("netsnmp")
           end
         end
-        
+        puts "2"
         # 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|
-          callback.call(operation, reqid, pdu, magic) if callback
+          #puts "callback is #{callback.inspect}"
+          #callback.call(operation, reqid, pdu, magic) if callback
 
           puts "in main callback"
-          if self.class.requests[reqid]
+          if @requests[reqid]
             puts "got request"
             pdu = Net::SNMP::PDU.new(pdu_ptr)
-            self.class.requests[reqid].call(pdu)
-            self.class.requests.delete(reqid)
+            @requests[reqid].call(pdu)
+            @requests.delete(reqid)
           end
           0
         end
-
-        @struct = Wrapper.snmp_open(@sess.pointer)
+        puts "3"
+        @struct = Wrapper.snmp_sess_open(@sess.pointer)
+        puts "4"
         #@handle = Wrapper.snmp_sess_open(@sess.pointer)
         #@struct = Wrapper.snmp_sess_session(@handle)
       end
 
 
+      def close
+        Net::SNMP::Session.lock.synchronize {
+          Wrapper.snmp_sess_close(@struct)
+          Net::SNMP::Session.sessions.delete(self.sessid)
+        }
+      end
 
       def get(oidlist, options = {}, &block)
         pdu = Net::SNMP::PDU.new(Constants::SNMP_MSG_GET)
@@ -146,6 +167,14 @@ module Net
         send_pdu(pdu, &block)
       end
 
+      def method_missing(m, *args)
+        if @struct.respond_to?(m)
+          @struct.send(m, *args)
+        else
+          super
+        end
+      end
+
 
       # XXX This needs work.  Need to use getbulk for speed, guess maxrepeaters, etc..
       # Also need to figure out how we can tell column names from something like ifTable
@@ -157,6 +186,7 @@ module Net
         results = []
 
         first_result = get_next(column_names)
+        puts "got first result #{first_result.inspect}"
         oidlist = []
         good_column_names = []
         row = {}
@@ -173,7 +203,7 @@ module Net
 
         catch :break_main_loop do
           while(result = get_next(oidlist))
-            #puts "got result #{result.inspect}"
+            puts "got result #{result.inspect}"
             oidlist = []
             row = {}
             result.varbinds.each_with_index do |vb, idx|
@@ -212,13 +242,83 @@ module Net
       end
 
       def error(msg)
-        Wrapper.snmp_perror("snmp_error")
-        Wrapper.snmp_sess_perror( "snmp_error", @sess.pointer)
+        Wrapper.snmp_perror(msg)
+        Wrapper.snmp_sess_perror(msg, @sess.pointer)
+        
         #Wrapper.print_session(self.struct)
         raise Net::SNMP::Error.new({:session => self}), msg
       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 poll(timeout = nil)
+        
+          puts "IN POLL"
+          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"
+          num = Net::SNMP::Wrapper.snmp_sess_select_info(@struct, num_fds, fdset, tval.pointer, block )
+          puts "done snmp_select_info. #{num}"
+          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 = RubyWrapper.rb_thread_select(num_fds.read_int, fdset, nil, nil, tv)
+          puts "calling select"
+          num_ready = Net::SNMP::Wrapper.select(num_fds.read_int, fdset, nil, nil, tv)
+          puts "done select"
+          #puts "done select.  num_ready = #{num_ready}"
+          if num_ready > 0
+            Net::SNMP::Wrapper.snmp_sess_read(@struct, 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
+
       private
       def send_pdu(pdu, &block)
         #puts "send_pdu #{Fiber.current.inspect}"
@@ -232,18 +332,19 @@ module Net
           Fiber.yield
         else
           if block
-            self.class.requests[pdu.reqid] = block
-            if (status = Net::SNMP::Wrapper.snmp_send(@struct, pdu.pointer)) == 0
+            @requests[pdu.reqid] = block
+            if (status = Net::SNMP::Wrapper.snmp_sess_send(@struct, pdu.pointer)) == 0
               error("snmp_get async failed")
             end
-            pdu.free
+            #pdu.free
             nil
           else
             response_ptr = FFI::MemoryPointer.new(:pointer)
             #Net::SNMP::Wrapper.print_session(@struct)
             #Net::SNMP::Wrapper.print_pdu(pdu.struct)
-            status = Wrapper.snmp_synch_response(@struct, pdu.pointer, response_ptr)
-            #pdu.free
+            status = Net::SNMP::Wrapper.snmp_sess_synch_response(@struct, pdu.pointer, response_ptr)
+            puts "called snmp_sync_response"
+            #pdu.free  #causing segfaults
             if status != 0
               error("snmp_get failed #{status}")
             else
@@ -279,28 +380,6 @@ module Net
 
 
 
-      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)

data/lib/net/snmp/utility.rb

@@ -0,0 +1,10 @@
+module Net::SNMP::Utility
+  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

data/lib/net/snmp/varbind.rb

@@ -26,7 +26,7 @@ module Net
         when Constants::ASN_OCTET_STR
           struct.val[:string].read_string(struct.val_len)
         when Constants::ASN_INTEGER, Constants::ASN_COUNTER, Constants::ASN_GAUGE
-          struct.val[:integer].read_int
+          struct.val[:integer].read_long
         when Constants::ASN_IPADDRESS
           struct.val[:objid].read_string(struct.val_len).unpack('CCCC').join(".")
         end

data/lib/net/snmp/version.rb

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

data/lib/net/snmp/wrapper.rb

@@ -278,7 +278,7 @@ module Wrapper
   attach_function :snmp_get_do_debugging, [  ], :int
   attach_function :snmp_error, [ :pointer, :pointer, :pointer, :pointer ], :void
   attach_function :snmp_sess_init, [ :pointer ], :void
-  attach_function :snmp_sess_open, [ :pointer ], :pointer
+  attach_function :snmp_sess_open, [ :pointer ], SnmpSession.typed_pointer
   attach_function :snmp_sess_pointer, [ :pointer ], :pointer
   attach_function :snmp_sess_session, [ :pointer ], SnmpSession.typed_pointer
   attach_function :snmp_sess_transport, [ :pointer ], :pointer
@@ -340,11 +340,12 @@ module Wrapper
   attach_function :snmp_set_detail, [ :string ], :void
   
   attach_function :snmp_select_info, [:pointer, :pointer, :pointer, :pointer], :int
-  attach_function :select, [:int, :pointer, :pointer, :pointer, :pointer], :int
   attach_function :snmp_read, [:pointer], :void
   attach_function :generate_Ku, [:pointer, :int, :string, :int, :pointer, :pointer], :int
 
-  
+
+  # Standard IO functions
+  attach_function :select, [:int, :pointer, :pointer, :pointer, :pointer], :int
   # MIB functions
   attach_function :init_mib, [], :void
   attach_function :read_all_mibs, [], :void
@@ -355,7 +356,6 @@ module Wrapper
 
   attach_function :get_tree_head, [], Tree.typed_pointer
   attach_function :get_tree, [:pointer, :int, :pointer], Tree.typed_pointer
-
   #attach_function :send_easy_trap, [:int, :int], :void
   #attach_function :send_trap_vars, [:int, :int, :pointer], :void
   #attach_function :send_v2trap, [:pointer], :void
@@ -368,3 +368,10 @@ module Wrapper
 end
 end
 end
+
+#module RubyWrapper
+#  extend NiceFFI::Library
+#  #ffi_lib "libruby"
+#  ffi_lib "/Users/rmcclain/.rvm/rubies/ruby-1.9.2-preview3/lib/libruby.dylib"
+#  attach_function :rb_thread_select, [:int, :pointer, :pointer, :pointer, :pointer], :int
+#end

data/net-snmp.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path("../lib", __FILE__)
 $:.unshift lib
-#require 'net/snmp/version'
+require 'net/snmp/version'
 
 Gem::Specification.new do |s|
   s.name        = "net-snmp"
-  s.version     = '0.1.5'
+  s.version     = Net::SNMP::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ron McClain"]
   s.email       = ["mixtli@github.com"]

data/spec/async_spec.rb

@@ -16,15 +16,17 @@ describe "async" do
     end
 
     it "getnext should work" do
-     did_callback = false
+      puts "testing getnext"
+      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/)
+          #result.varbinds[0].value.should eql("test.net-snmp.org")
+          #result.varbinds[1].value.should match(/Coders/)
         end
       end
       Net::SNMP::Dispatcher.poll(false)
+      puts "done getnext"
       did_callback.should be(true)
     end
 
@@ -45,7 +47,7 @@ describe "async" do
     end
 
     it "getnext should work" do
-     did_callback = false
+      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
@@ -74,11 +76,11 @@ describe "async" do
           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 = 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")
@@ -86,13 +88,14 @@ describe "async" do
         end
       end
       Net::SNMP::Dispatcher.poll(false)
+      sess.close
       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 = 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")
@@ -100,6 +103,7 @@ describe "async" do
         end
       end
       Net::SNMP::Dispatcher.poll(false)
+      sess.close
       did_callback.should be(true)
     end
   end

data/spec/em_spec.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'eventmachine'
 
 describe "em" do
   
   it "should work in event_machine" do
-    require 'eventmachine'
     did_callback = false
     EM.run do
       Net::SNMP::Dispatcher.em_loop

data/spec/fiber_spec.rb

@@ -13,6 +13,7 @@ describe "in fiber" do
 
 
   it "get should work in a fiber with synchronous calling style" do
+    #pending
     wrap_fiber do
         session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic')
         result = session.get("sysDescr.0")
@@ -22,6 +23,7 @@ describe "in fiber" do
   end
 
   it "getnext" do
+    #pending
     wrap_fiber do
       Net::SNMP::Session.open(:peername => "test.net-snmp.org", :community => "demopublic" ) do |sess|
         result = sess.get_next(["sysUpTimeInstance.0"])
@@ -32,6 +34,7 @@ describe "in fiber" do
   end
 
   it "should get using snmpv3" do
+    #pending
     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"])

data/spec/net-snmp_spec.rb

@@ -1,22 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "NetSnmp" do
-  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|
-      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
-    Thread.new do
-      while Net::SNMP::Dispatcher.poll == 0
-        sleep 1
-      end
-    end.join
-    did_callback.should be(true)
-  end
+
 
 
 #  it "should get columns" do
@@ -29,28 +14,5 @@ describe "NetSnmp" do
 #  end
 
 
-  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 translate an oid" do
-
-    oid = Net::SNMP::OID.new("ifDescr.1")
-    oid.node.label.should eql("ifDescr")
-    oid.label.should eql("ifDescr.1")
-    oid.index.should eql("1")
-  end
-
-
-
-
-
-
-
 
 end

data/spec/oid_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Net::SNMP::OID do
+  it "should instantiate valid oid with numeric" do
+    oid = Net::SNMP::OID.new("1.3.6.1.2.1.2.1.0")
+    oid.to_s.should eql("1.3.6.1.2.1.2.1.0")
+    oid.label.should eql("ifNumber.0")
+  end
+
+  it "should instantiate valid oid with string" do
+    oid = Net::SNMP::OID.new("ifNumber.0")
+    oid.to_s.should eql("1.3.6.1.2.1.2.1.0")
+    oid.label.should eql("ifNumber.0")
+  end
+end

data/spec/sync_spec.rb

@@ -10,6 +10,14 @@ describe "synchronous calls" do
       end
     end
 
+    it "multiple calls within session 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")
+        second = sess.get("sysName.0")
+        second.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"])
@@ -58,6 +66,7 @@ describe "synchronous calls" do
     end
 
     it "get_table should work with multiple columns" do
+      #pending
       session = Net::SNMP::Session.open(:peername => "localhost", :version => '1')
       table = session.get_table("ifTable", :columns => ["ifIndex", "ifDescr", "ifName"])
       table[0]['ifName'].should eql("lo0")
@@ -79,17 +88,18 @@ describe "synchronous calls" do
 
   context "version 3" do
     it "should get using snmpv3" do
+      #pending
       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
+    it "should set using snmpv3" do
+      pending
+      Net::SNMP::Session.open(:peername => '127.0.0.1', :version => 3, :username => 'myuser', :auth_protocol => :sha1, :password => '0x1234') 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

data/spec/thread_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "in a thread" do
+  it "should get an oid asynchronously in a thread" do
+    did_callback = false
+    puts "calling thread"
+    dispatch_thread = Net::SNMP::Dispatcher.thread_loop
+    puts "still here"
+    Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
+      puts "sending get"
+      s.get(["sysDescr.0", "sysContact.0"]) do |result|
+        puts "got callback"
+        did_callback = true
+        result.varbinds[0].value.should eql("test.net-snmp.org")
+        result.varbinds[1].value.should match(/Coders/)
+      end
+    end
+    sleep 3
+    puts "joining thread"
+    did_callback.should be(true)
+
+    Thread.kill(dispatch_thread)
+  end
+end

data/spec/utility_spec.rb

@@ -0,0 +1,10 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Net::SNMP::Utility do
+  it "should compare oids" do
+    Net::SNMP::Utility.oid_lex_cmp('1.3.5', '1.3.7').should eql(-1)
+    Net::SNMP::Utility.oid_lex_cmp('1.3.7', '1.3.5').should eql(1)
+    Net::SNMP::Utility.oid_lex_cmp('1.3.7', '1.3.7.1').should eql(-1)
+    Net::SNMP::Utility.oid_lex_cmp('1.3.5', '1.3.5').should eql(0)
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Ron McClain
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 -05:00
+date: 2011-04-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ files:
 - lib/net/snmp/oid.rb
 - lib/net/snmp/pdu.rb
 - lib/net/snmp/session.rb
+- lib/net/snmp/utility.rb
 - lib/net/snmp/varbind.rb
 - lib/net/snmp/version.rb
 - lib/net/snmp/wrapper.rb
@@ -86,8 +87,11 @@ files:
 - spec/fiber_spec.rb
 - spec/mib_spec.rb
 - spec/net-snmp_spec.rb
+- spec/oid_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
+- spec/thread_spec.rb
+- spec/utility_spec.rb
 - spec/wrapper_spec.rb
 has_rdoc: true
 homepage: ""
@@ -127,6 +131,9 @@ test_files:
 - spec/fiber_spec.rb
 - spec/mib_spec.rb
 - spec/net-snmp_spec.rb
+- spec/oid_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
+- spec/thread_spec.rb
+- spec/utility_spec.rb
 - spec/wrapper_spec.rb