net-snmp 0.1.0 → 0.1.2

data/README.rdoc

@@ -15,28 +15,28 @@ It provides classes for sessions, pdus, varbinds, and more.
 
 == USAGE
 
-  You must have the net-snmp libraries installed and available on the system.  Check to make sure
+You must have the net-snmp libraries installed and available on the system.  Check to make sure
 they are available in your library path.  If necessary, add them to your shell like so:
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/local/lib/net-snmp
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/local/lib/net-snmp
 
 
-  You can use the library in two styles:  synchronously or asynchronously.  If you use the synchronous style,
+You can use the library in two styles:  synchronously or asynchronously.  If you use the synchronous style,
 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.  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.
 
-  If you like eventmachine, it's very easy to set up the dispatcher to run periodically in the adaptor.  If you're
+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
 calls, while allowing you to use a synchronous calling style.  Examples of all these scenarios are below.
 
 == FFI
-  This library uses ruby-ffi to access the net-snmp libraries.  If you want to use the C library directly, the wrapper
+This library uses ruby-ffi to access the net-snmp libraries.  If you want to use the C library directly, the wrapper
 functions are defined in Net::SNMP::Wrapper.  You can call them like so:
   Net::SNMP::Wrapper.snmp_perror("some_error")
 
@@ -111,6 +111,18 @@ background, control is passed back to the reactor fiber to process other request
 data is available.  This is all seemless to you, the developer.  Behold the power of fibers!
 
 
+== MIBs
+
+By default, net-snmp loads all of your system MIBS.  You can add additional mibs by adding them to your MIBS environment variable.
+You can also explicitly add MIBs using the MIB api.  For example:
+
+  Net::SNMP::MIB.add_mibdir("/usr/local/share/mibs")
+  Net::SNMP::MIB.read_mib("RFC1213-MIB.txt")
+
+Having the appropriate MIBs loaded will allow you to pass names instead of numeric oids to net-snmp methods.  To translate a single oid,
+you can call Net::SNMP.get_oid("sysDescr.0").  For more complex MIB parsing needs, see smi-ffi[http://github.com/mixtli/smi-ffi]
+
+
 == CAVEATS/DISCLAIMER
 
 THIS GEM COULD CRASH YOUR SYSTEM AND EAT YOUR CHILDREN!
@@ -129,7 +141,7 @@ break this gem.  Please let me know if you find bugs or missing features.  Or be
 * Better documentation
 * More tests
 * Cleanup cruft and unused code
-
+* Implement SNMP traps/informs?
 
 == Note on Patches/Pull Requests
  

data/lib/net-snmp.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
 require 'nice-ffi'
 require 'fiber'
-%w(snmp 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).each do |f|
   require "#{File.dirname(__FILE__)}/net/#{f}"
 end
 Net::SNMP::MIB.init

data/lib/net/snmp/inline.rb

@@ -2,13 +2,6 @@ module Net
   module SNMP
     module Inline
       extend Inliner
-      
-      #module LibC
-      #  extend FFI::Library
-      #  ffi_lib 'C'
-      #  attach_function :malloc, [ :uint ], :pointer
-      #  attach_function :free, [ :pointer ], :void
-      #end
 
       inline do |builder|
         builder.include "sys/select.h"
@@ -31,9 +24,6 @@ module Net
         }
 
       end
-
-
-      
     end
   end
 end

data/lib/net/snmp/mib.rb

@@ -1,3 +1,4 @@
+Net::SNMP::Wrapper.snmp_set_save_descriptions(1)
 module Net
   module SNMP
     module MIB
@@ -13,7 +14,16 @@ module Net
         Node.get_node(oid)
       end
 
+      def self.add_mibdir(dirname)
+        Wrapper.add_mibdir(dirname)
+      end
 
+      def self.read_mib(filename)
+        Wrapper.read_mib(filename)
+      end
+      def self.read_module(name)
+        Wrapper.read_module(name)
+      end
       
     end
   end

data/lib/net/snmp/mib/node.rb

@@ -1,4 +1,3 @@
-
 module Net::SNMP
   module MIB
     class Node
@@ -8,8 +7,10 @@ module Net::SNMP
       
       class << self
         def get_node(oid)
-          oid_ptr, oid_len_ptr = Net::SNMP._get_oid(oid)
-          struct = Wrapper.get_tree(oid_ptr, oid_len_ptr.read_int, Wrapper.get_tree_head().pointer)
+          if oid.kind_of?(String)
+            oid = Net::SNMP::OID.new(oid)
+          end
+          struct = Wrapper.get_tree(oid.pointer, oid.length_pointer.read_int, Wrapper.get_tree_head().pointer)
           new(struct.pointer)
         end
       end
@@ -22,10 +23,14 @@ module Net::SNMP
           raise "invalid type"
         end
       end
-      
+
+      def description
+        @struct.description.read_string
+      end
+
       def oid
         return @oid if @oid
-        @oid = Net::SNMP.get_oid(label)
+        @oid = Net::SNMP::OID.new(label)
       end
 
       # actually seems like list is linked backward, so this will retrieve the previous oid numerically
@@ -46,6 +51,7 @@ module Net::SNMP
         while child = child.next
           children << child
         end
+        children.pop
         children.reverse  # For some reason, net-snmp returns everything backwards
       end
       

data/lib/net/snmp/oid.rb

@@ -1,20 +1,22 @@
 module Net
   module SNMP
     class OID
+      attr_reader :oid, :pointer, :length_pointer
       def initialize(oid)
         @oid = oid
-        @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)
+        @pointer = FFI::MemoryPointer.new(:ulong, Constants::MAX_OID_LEN)
+        @length_pointer = FFI::MemoryPointer.new(:size_t)
+        @length_pointer.write_int(Constants::MAX_OID_LEN)
 
         if @oid =~ /^[\d\.]*$/
-          if Wrapper.read_objid(@oid, @oid_ptr, @oid_len_ptr) == 0
+          if Wrapper.read_objid(@oid, @pointer, @length_pointer) == 0
             Wrapper.snmp_perror(@oid)
           end
         else
-          if Wrapper.get_node(@oid, @oid_ptr, @oid_len_ptr) == 0
+          if Wrapper.get_node(@oid, @pointer, @length_pointer) == 0
             Wrapper.snmp_perror(@oid)
           end
+          @oid = c_oid
         end
 
       end
@@ -23,17 +25,26 @@ module Net
         @oid
       end
 
+      def name
+        @oid
+      end
+
       def c_oid
-        @oid_ptr.read_array_of_long(@oid_len_ptr.read_int).join(".")
+        @pointer.read_array_of_long(length_pointer.read_int).join(".")
       end
 
-      def pointer
-        @oid_ptr
+      def node
+        MIB::Node.get_node(oid)
       end
-      def length_pointer
-        @oid_len_ptr
+
+      def index
+        oid.sub(node.oid.name + ".","")
       end
 
+      def label
+        node.label + "." + index
+      end
+   
     end
   end
 end

data/lib/net/snmp/pdu.rb

@@ -25,19 +25,19 @@ module Net
         end
       end
 
-       # For getbulk requests, repeaters and maxreps are stored in errstat and errindex
-        def non_repeaters=(nr)
-          @struct.errstat = nr
-        end
-        def non_repeaters
-          @struct.errstat
-        end
-        def max_repetitions=(mr)
-          @struct.errindex = mr
-        end
-        def max_repetitions
-          @struct.errindex
-        end
+      # For getbulk requests, repeaters and maxreps are stored in errstat and errindex
+      def non_repeaters=(nr)
+        @struct.errstat = nr
+      end
+      def non_repeaters
+        @struct.errstat
+      end
+      def max_repetitions=(mr)
+        @struct.errindex = mr
+      end
+      def max_repetitions
+        @struct.errindex
+      end
 
 
       def add_varbind(options)

data/lib/net/snmp/session.rb

@@ -55,7 +55,6 @@ module Net
         if @sess.version == Constants::SNMP_VERSION_3
           @sess.securityLevel = options[:security_level] || Constants::SNMP_SEC_LEVEL_NOAUTH
 
-          oid = Net::SNMP::OID.new("1.3.6.1.6.3.10.1.1.2")
           @sess.securityAuthProto = case options[:auth_protocol]
               when :sha1
                 Net::SNMP::OID.new("1.3.6.1.6.3.10.1.1.3").pointer
@@ -155,7 +154,48 @@ module Net
       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
+      # instead of ifEntry.  Needs to handle errors, there are probably offset problems
+      # in cases of bad data, and various other problems.  Also need to add async support.
+      # Maybe return a hash with index as key?
+      def get_table(table_name, options = {})
+        column_names = options[:columns] || Net::SNMP::MIB::Node.get_node(table_name).children.collect {|c| c.label }
+        puts "got column names #{column_names.inspect}"
+        results = []
+        oidlist = column_names
+        done = false
+        catch :break_outer_loop do
+          first_loop = true
+
+          while(result = get_next(oidlist))
+            puts "got result #{result.inspect}"
+            oidlist = []
+            row = {}
+            result.varbinds.each_with_index do |vb, idx|
+              puts "got vb #{vb.value.inspect}"
+              oid = vb.oid
+              row[column_names[idx]] = vb.value
+              oidlist << oid.label
+              if oid.label[0..column_names[idx].length - 1] != column_names[idx]
+                puts "breaking"
+                if first_loop
+                  puts "deleting #{oid.label}"
+                  oidlist.delete(oid.label)
+                  column_names.delete_at(idx)
+                  puts "columns now #{column_names.inspect}"
+                else
+                  throw :break_outer_loop
+
+                end
+              end
+            end
+            results << row
+            first_loop = false
+          end
+        end
+        results
+      end
       
       def error(msg)
         Wrapper.snmp_perror("snmp_error")
@@ -185,14 +225,18 @@ module Net
 
       private
       def send_pdu(pdu, &block)
-
-
+        #puts "send_pdu #{Fiber.current.inspect}"
         if defined?(EM) && EM.reactor_running? && !block_given?
+          #puts "REACTORRUNNING"
           f = Fiber.current
 
           send_pdu pdu do | response |
             f.resume(response)
           end
+
+
+
+          
           Fiber.yield
         else
           if block

data/lib/net/snmp/varbind.rb

@@ -16,19 +16,24 @@ module Net
       end
       
       def oid
-        @struct.name.read_array_of_long(@struct.name_length).join(".")
+        @oid ||= Net::SNMP::OID.new(@struct.name.read_array_of_long(@struct.name_length).join("."))
       end
       
-      def name
-        oid
-      end
+
 
       def value
         case object_type
         when Constants::ASN_OCTET_STR
           struct.val[:string].read_string(struct.val_len)
-        when Constants::ASN_INTEGER, Net::SNMP::ASN_COUNTER
+        when Constants::ASN_INTEGER, Constants::ASN_COUNTER
           struct.val[:integer].read_int
+        when Constants::ASN_IPADDRESS
+          struct.val[:objid].read_string(struct.val_len).unpack('CCCC').join(".")
+          #puts "here #{arr.to_s}"
+          #puts arr[0]
+          #puts arr[1]
+          #puts arr[2]
+          #puts arr[3]
         end
       end
     end

data/lib/net/snmp/version.rb

@@ -1,5 +1,5 @@
 module Net
-  module Snmp
-    VERSION = "0.1.0"
+  module SNMP
+    VERSION = "0.1.2"
   end
 end

data/lib/net/snmp/wrapper.rb

@@ -2,7 +2,7 @@ module Net
 module SNMP
 module Wrapper
   extend NiceFFI::Library
-  ffi_lib "/opt/local/lib/libnetsnmp.dylib"
+  ffi_lib "libnetsnmp"
   #ffi_lib "netsnmp"
   typedef :u_long, :oid
 
@@ -214,40 +214,14 @@ module Wrapper
       :reported, :int,
       :defaultValue, :pointer
     )
-      # struct tree    *child_list;     /* list of children of this node */
-      # struct tree    *next_peer;      /* Next node in list of peers */
-      # struct tree    *next;   /* Next node in hashed list of names */
-      # struct tree    *parent;
-      # char           *label;  /* This node's textual name */
-      # u_long          subid;  /* This node's integer subidentifier */
-      # int             modid;  /* The module containing this node */
-      # int             number_modules;
-      # int            *module_list;    /* To handle multiple modules */
-      # int             tc_index;       /* index into tclist (-1 if NA) */
-      # int             type;   /* This node's object type */
-      # int             access; /* This nodes access */
-      # int             status; /* This nodes status */
-      # struct enum_list *enums;        /* (optional) list of enumerated integers */
-      # struct range_list *ranges;
-      # struct index_list *indexes;
-      # char           *augments;
-      # struct varbind_list *varbinds;
-      # char           *hint;
-      # char           *units;
-      # int             (*printomat) (u_char **, size_t *, size_t *, int,
-      #                               const netsnmp_variable_list *,
-      #                               const struct enum_list *, const char *,
-      #                               const char *);
-      # void            (*printer) (char *, const netsnmp_variable_list *, const struct enum_list *, const char *, const char *);   /* Value printing function */
-      # char           *description;    /* description (a quoted string) */
-      # char           *reference;    /* references (a quoted string) */
-      # int             reported;       /* 1=report started in print_subtree... */
-      # char           *defaultValue;
   end
-  attach_function :init_mib, [], :void
-  attach_function :read_all_mibs, [], :void
-  attach_function :get_tree_head, [], Tree.typed_pointer
-  attach_function :get_tree, [:pointer, :int, :pointer], Tree.typed_pointer
+  class IndexList < NiceFFI::Struct
+    layout(
+        :next, :pointer,
+        :ilabel, :pointer,
+        :isimplied, :char
+    )
+  end
 
 
 #  puts "snmp_session size = #{SnmpSession.size}"
@@ -354,7 +328,7 @@ module Wrapper
   attach_function :asn_parse_double, [ :pointer, :pointer, :pointer, :pointer, :uint ], :pointer
 
   attach_function :snmp_pdu_create, [:int], SnmpPdu.typed_pointer
-  attach_function :get_node, [:pointer, :pointer, :pointer], :int
+  attach_function :get_node,[:string, :pointer, :pointer], :int
   attach_function :read_objid, [:string, :pointer, :pointer], :int
   attach_function :snmp_add_null_var, [:pointer, :pointer, :size_t], :pointer
   attach_function :snmp_sess_synch_response, [:pointer, :pointer, :pointer], :int
@@ -368,6 +342,19 @@ module Wrapper
   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
+
+  
+  # MIB functions
+  attach_function :init_mib, [], :void
+  attach_function :read_all_mibs, [], :void
+  attach_function :add_mibdir, [:string], :int
+  attach_function :read_mib, [:string], Tree.typed_pointer
+  attach_function :read_module, [:string], Tree.typed_pointer
+  attach_function :snmp_set_save_descriptions, [:int], :void
+
+  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

data/net-snmp.gemspec

@@ -4,7 +4,7 @@ require "net/snmp/version"
 
 Gem::Specification.new do |s|
   s.name        = "net-snmp"
-  s.version     = Net::Snmp::VERSION
+  s.version     = Net::SNMP::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ron McClain"]
   s.email       = ["mixtli@github.com"]

data/spec/mib_spec.rb

@@ -12,12 +12,14 @@ describe Net::SNMP::MIB::Node do
    #   puts node.parent.inspect
   end
   
-  it "should get children" do
-    node = Net::SNMP::MIB::Node.get_node("system")
-    node.children.each do |c|
-    #  puts c.inspect
-    end
+
+  it "should get node children" do
+    node = Net::SNMP::MIB::Node.get_node("ifTable")
+    if_entry = node.children.first
+    if_entry.label.should eql("ifEntry")
+    if_entry.children.first.label.should eql("ifIndex")
   end
+
   
   it "should get siblings" do
     node = Net::SNMP::MIB::Node.get_node("sysDescr")
@@ -28,7 +30,7 @@ describe Net::SNMP::MIB::Node do
   it "should get oid" do
     node = Net::SNMP::MIB::Node.get_node("sysDescr")
     puts node.struct.inspect
-    node.oid.should eq("1.3.6.1.2.1.1.1")
+    node.oid.name.should eq("1.3.6.1.2.1.1.1")
   end
   
   it "should get by oid" do

data/spec/net-snmp_spec.rb

@@ -20,7 +20,6 @@ describe "NetSnmp" 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|
-        puts "in callback"
         did_callback = true
         result.varbinds[0].value.should eql("test.net-snmp.org")
         result.varbinds[1].value.should match(/Coders/)
@@ -31,13 +30,10 @@ describe "NetSnmp" do
   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|
       s.get(["sysDescr.0", "sysContact.0"]) do |result|
-        puts "in callback"
         did_callback = true
         result.varbinds[0].value.should eql("test.net-snmp.org")
         result.varbinds[1].value.should match(/Coders/)
@@ -102,7 +98,7 @@ describe "NetSnmp" do
   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.name.should eql("1.3.6.1.2.1.1.4.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
@@ -111,13 +107,44 @@ describe "NetSnmp" do
   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.should eql("1.3.6.1.2.1.1.5.0")
+      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"
+  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)
+  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 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
+
+
+
   it "should work in event_machine" do
     require 'eventmachine'
     did_callback = false
@@ -134,8 +161,7 @@ describe "NetSnmp" do
         
       end
 
-      EM.add_timer(2) do
-        puts "in timer"
+      EM.add_timer(3) do
         did_callback.should be_true
         EM.stop
       end
@@ -154,15 +180,12 @@ describe "NetSnmp" do
         session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
           s.get("sysDescr.0") do |result|
             did_callback = true
-            puts "INHERERERERERERE"
-            puts result.inspect
             result.varbinds[0].value.should eql("test.net-snmp.org")
           end
 
         end
 
-        EM.add_timer(2) do
-          puts "in timer"
+        EM.add_timer(3) do
           did_callback.should eql(true)
           EM.stop
         end
@@ -176,26 +199,19 @@ describe "NetSnmp" do
     require 'eventmachine'
     did_callback = false
     EM.run do
-      puts "em fiber = #{Fiber.current.inspect}"
       Fiber.new {
-        puts "inner fiber = #{Fiber.current.inspect}"
 
         EM.tick_loop do
-          #puts "tick_fiber = #{Fiber.current.inspect}"
 
           Net::SNMP.dispatcher
         end
         sleep 1
         session = Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic')
-        puts "calling aget"
         result = session.get("sysDescr.0")
         result.varbinds[0].value.should eql("test.net-snmp.org")
-
-
       }.resume
       EM.stop
     end
-
   end
 
 

data/spec/wrapper_spec.rb

@@ -5,68 +5,59 @@ describe "Net::SNMP::Wrapper" do
     community = "demopublic"
     peername = "test.net-snmp.org"
     
-    sess = Net::SNMP::Wrapper::SnmpSession.new
-    Net::SNMP::Wrapper.snmp_sess_init(sess.pointer)
-    sess.community = FFI::MemoryPointer.new(:pointer, community.length + 1)
-    #sess.community.autorelease = false
-    sess.community.write_string(community)
-    sess.community_len = community.length
-    sess.peername = FFI::MemoryPointer.new(:pointer, peername.length + 1)
-    #sess.peername.autorelease = false
-    sess.peername.write_string(peername)
-    sess.version = Net::SNMP::SNMP_VERSION_1
+    @session = Net::SNMP::Wrapper::SnmpSession.new(nil)
+    Net::SNMP::Wrapper.snmp_sess_init(@session.pointer)
+    @session.community = FFI::MemoryPointer.from_string(community)
+    @session.community_len = community.length
+    @session.peername = FFI::MemoryPointer.from_string(peername)
+    @session.version = Net::SNMP::Constants::SNMP_VERSION_1
 
-    @handle = Net::SNMP::Wrapper.snmp_sess_open(sess.pointer)
-    Net::SNMP::Wrapper.snmp_sess_session(@handle)
-
-    sess
+    @handle = Net::SNMP::Wrapper.snmp_sess_open(@session.pointer)
+    @session_struct = Net::SNMP::Wrapper.snmp_sess_session(@handle)
   end
 
   def make_pdu
-    pdu_ptr = Net::SNMP::Wrapper.snmp_pdu_create(Net::SNMP::SNMP_MSG_GET)
-    pdu = Net::SNMP::Wrapper::SnmpPdu.new(pdu_ptr)
-    anOID = FFI::MemoryPointer.new(:ulong, Net::SNMP::MAX_OID_LEN)
-    anOIDLen = FFI::MemoryPointer.new(:size_t)
-    anOIDLen.write_int(Net::SNMP::MAX_OID_LEN)
-    Net::SNMP::Wrapper.snmp_parse_oid("sysDescr.0", anOID, anOIDLen)
-    Net::SNMP::Wrapper.snmp_add_null_var(pdu.pointer, anOID, anOIDLen.read_int)
-    pdu
+    @pdu = Net::SNMP::Wrapper.snmp_pdu_create(Net::SNMP::Constants::SNMP_MSG_GET)
+    @oid_ptr = FFI::MemoryPointer.new(:ulong, Net::SNMP::Constants::MAX_OID_LEN)
+    @oid_len_ptr = FFI::MemoryPointer.new(:size_t)
+    @oid_len_ptr.write_int(Net::SNMP::Constants::MAX_OID_LEN)
+    puts @pdu.inspect
+
+    Net::SNMP::Wrapper.get_node("sysDescr.0", @oid_ptr, @oid_len_ptr)
+    Net::SNMP::Wrapper.snmp_pdu_add_variable(@pdu.pointer, @oid_ptr, @oid_len_ptr.read_int, Net::SNMP::Constants::ASN_NULL, nil, 0)
   end
 
   it "wrapper should snmpget synchronously" do
     #pending
-    sess = init_session
-    sess = Net::SNMP::Wrapper.snmp_open(sess.pointer)
+    init_session
 
-    pdu = make_pdu
+    make_pdu
 
     response_ptr = FFI::MemoryPointer.new(:pointer)
-    #response_ptr.autorelease = false
-    status = Net::SNMP::Wrapper.snmp_sess_synch_response(@handle, pdu.pointer, response_ptr)
+    status = Net::SNMP::Wrapper.snmp_sess_synch_response(@handle, @pdu.pointer, response_ptr)
     status.should eql(0)
-     
+
     response = Net::SNMP::Wrapper::SnmpPdu.new(response_ptr.read_pointer)
-    value = response.variables.val[:string].read_string
-    puts "val_len = #{response.variables.val_len}"
+    value = response.variables.val[:string].read_string(response.variables.val_len)
     value.should eql('test.net-snmp.org')
   end
 
   it "wrapper should snmpget asynchronously" do
-      pending
-      sess = init_session
-      pdu = make_pdu
+      #pending
+      init_session
+      make_pdu
       did_callback = 0
       result = nil
-      sess.callback = lambda do |operation, session, reqid, pdu_ptr, magic|
+      @session.callback = lambda do |operation, session, reqid, pdu_ptr, magic|
         did_callback = 1
         pdu = Net::SNMP::Wrapper::SnmpPdu.new(pdu_ptr)
         variables = Net::SNMP::Wrapper::VariableList.new(pdu.variables)
-        result = variables.val[:string].read_string
+        result = variables.val[:string].read_string(variables.val_len)
         0
       end
-      sess = Net::SNMP::Wrapper.snmp_open(sess.pointer)
-      Net::SNMP::Wrapper.snmp_send(sess.pointer, pdu)
-
+      sess = Net::SNMP::Wrapper.snmp_open(@session.pointer)
+      Net::SNMP::Wrapper.snmp_send(sess.pointer, @pdu)
+      sleep 1
       fdset = Net::SNMP::Wrapper.get_fd_set
       fds = FFI::MemoryPointer.new(:int)
       #fds.autorelease = false

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: net-snmp
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ron McClain
@@ -14,47 +10,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -05:00
+date: 2011-03-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: nice-ffi
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 description: Uses ffi to create an object oriented wrapper around C net-snmp libraries
 email: 
@@ -75,9 +65,6 @@ files:
 - Rakefile
 - VERSION
 - bin/snmpget.rb
-- c/Makefile
-- c/test
-- c/test.c
 - interface/snmp_api.h
 - interface/snmp_api.i
 - interface/snmp_api_wrap.xml
@@ -113,6 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -4066083609341364486
       segments: 
       - 0
       version: "0"
@@ -121,13 +109,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -4066083609341364486
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: net-snmp
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Object oriented wrapper around C net-snmp libraries

data/c/Makefile

@@ -1,3 +0,0 @@
-all:
-	gcc -o test -L/opt/local/lib -I/opt/local/include -lnetsnmp test.c
-

data/c/test.c

@@ -1,137 +0,0 @@
-#include <stdio.h>
-#include "string.h"
-#include <net-snmp/net-snmp-config.h>
-#include <net-snmp/types.h>
-#include <net-snmp/library/parse.h>
-
-struct oid {
-  char *Name;
-  oid Oid[MAX_OID_LEN];
-  size_t OidLen;
-} oids[] = {
-  { "system.sysDescr.0" },
-  { "ifDescr.1" },
-  { "ifIndex.1" },
-  { NULL }
-};
-
-int main() {
-	struct oid *op = oids;
-	init_snmp("snmpdemoapp");
-	init_mib();
-	test_mib();
-    while (op->Name) {
-	    op->OidLen = sizeof(op->Oid)/sizeof(op->Oid[0]);
-
-		get_node(op->Name, op->Oid, &op->OidLen);
-
-	    op++;
-  	}
-
-	test_synch();
-
-
-}
-
-int test_mib() {
-	struct tree *mytree;
-	size_t oidlen;
-	int i = 0;
-	oid myoid[MAX_OID_LEN];
-	snmp_set_save_descriptions(1);
-
-	printf("sizeof(netsnmp_vardata) = %lu\n", sizeof(netsnmp_vardata));
-	printf("sizeof(netsnmp_variable_list) = %lu\n", sizeof(netsnmp_variable_list));
-	printf("sizeof(netsnmp_session) = %lu\n", sizeof(netsnmp_session));
-	printf("sizeof(netsnmp_pdu) = %lu\n", sizeof(netsnmp_pdu));
-	oidlen = 100;
-	get_node("interfaces.ifNumber.2", myoid, &oidlen);  
-	printf("oidlen = %lu\n", oidlen);
-	for(i=0;i < oidlen; i++) {
-	  printf("%lu\n", myoid[i]);
-	}
-	mytree = get_tree(myoid, oidlen, get_tree_head());
-	printf("label = %s\n", mytree->label);
-	printf("description = %s\n", mytree->description);
-	print_description(myoid, oidlen, 200);
-
-	print_mib_tree(stdout, mytree, 1000);
-}
-
-
-int test_synch() {
-	struct snmp_session ss, *sp;
-    struct oid *op;
-
-    snmp_sess_init(&ss);                        /* initialize session */
-    ss.version = SNMP_VERSION_2c;
-    ss.peername = "127.0.0.1";
-    ss.community = "public";
-    ss.community_len = strlen(ss.community);
-	printf("here\n");
-    snmp_synch_setup(&ss);
-    if (!(sp = snmp_open(&ss))) {
-      snmp_perror("snmp_open");
-      return;
-    }
-	printf("and here\n");
-    for (op = oids; op->Name; op++) {
-      struct snmp_pdu *req, *resp;
-      int status;
-      req = snmp_pdu_create(SNMP_MSG_GET);
-      snmp_add_null_var(req, op->Oid, op->OidLen);
-      status = snmp_synch_response(sp, req, &resp);
-	printf("got status %d\n", status);
-	printf("oid %s\n", op->Name);
-      if (!print_result(status, sp, resp)) break;
-      snmp_free_pdu(resp);
-    }
-    snmp_close(sp);
-}
-
-
-
-/*
- * simple printing of returned data
- */
-int print_result (int status, struct snmp_session *sp, struct snmp_pdu *pdu)
-{
-  char buf[1024];
-  struct variable_list *vp;
-  int ix;
-  struct timeval now;
-  struct timezone tz;
-  struct tm *tm;
-
-  gettimeofday(&now, &tz);
-  tm = localtime(&now.tv_sec);
-  fprintf(stdout, "%.2d:%.2d:%.2d.%.6d ", tm->tm_hour, tm->tm_min, tm->tm_sec,
-          now.tv_usec);
-  switch (status) {
-  case STAT_SUCCESS:
-    vp = pdu->variables;
-    if (pdu->errstat == SNMP_ERR_NOERROR) {
-      while (vp) {
-        snprint_variable(buf, sizeof(buf), vp->name, vp->name_length, vp);
-        fprintf(stdout, "%s: %s\n", sp->peername, buf);
-	vp = vp->next_variable;
-      }
-    }
-    else {
-      for (ix = 1; vp && ix != pdu->errindex; vp = vp->next_variable, ix++)
-        ;
-      if (vp) snprint_objid(buf, sizeof(buf), vp->name, vp->name_length);
-      else strcpy(buf, "(none)");
-      fprintf(stdout, "%s: %s: %s\n",
-      	sp->peername, buf, snmp_errstring(pdu->errstat));
-    }
-    return 1;
-  case STAT_TIMEOUT:
-    fprintf(stdout, "%s: Timeout\n", sp->peername);
-    return 0;
-  case STAT_ERROR:
-    snmp_perror(sp->peername);
-    return 0;
-  }
-  return 0;
-}