net-snmp 0.1.2 → 0.1.3

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in net-snmp.gemspec
 gemspec
 
+gem 'nice-ffi'
 #group :development, :test do
 # gem 'eventmachine', '1.0.0.beta.3'
 #end

data/README.rdoc

@@ -40,6 +40,10 @@ This library uses ruby-ffi to access the net-snmp libraries.  If you want to use
 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.
 
 
 == EXAMPLES
@@ -50,7 +54,8 @@ 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.   
+
 An asynchronous SNMP-GET
 
     Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |session|

data/bin/stress_test.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+require 'optparse'
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
+
+require 'net-snmp'
+
+Net::SNMP::Session.open do |sess|
+  loop do
+    200.times {
+      pdu = sess.get('ifIndex.1')
+      puts pdu.varbinds.first.value
+     pdu.free
+    }
+    sleep 1
+  end
+end

data/lib/net-snmp.rb

@@ -1,6 +1,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|
   require "#{File.dirname(__FILE__)}/net/#{f}"
 end

data/lib/net/snmp.rb

@@ -21,13 +21,21 @@ module Net
         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

data/lib/net/snmp/pdu.rb

@@ -1,4 +1,4 @@
-module Net
+module Net 
   module SNMP
     class PDU
       extend Forwardable
@@ -75,6 +75,9 @@ module Net
         Wrapper::snmp_errstring(errstat)
       end
 
+      def free
+        Wrapper.snmp_free_pdu(@struct.pointer)
+      end
     end
   end
 end

data/lib/net/snmp/session.rb

@@ -6,11 +6,11 @@ module Net
       extend Forwardable
       attr_accessor :struct, :callback
       def_delegator :@struct, :pointer
-      @sessions = []
+      #@sessions = []
       @requests = {}
       class << self
-        attr_accessor :sessions, :requests
-        def open(options)
+        attr_accessor :requests
+        def open(options = {})
           session = new(options)
           if block_given?
             yield session
@@ -19,13 +19,13 @@ module Net
         end
       end
 
-      def initialize(options)
+      def initialize(options = {})
+        options[:peername] ||= 'localhost'
         options[:community] ||= "public"
         options[:community_len] = options[:community].length
         options[:version] ||= Constants::SNMP_VERSION_1
         @callback = options[:callback]
-        @requests = {}
-        self.class.sessions << self
+        #self.class.sessions << self
         @sess = Wrapper::SnmpSession.new(nil)
         Wrapper.snmp_sess_init(@sess.pointer)
         #options.each_pair {|k,v| ptr.send("#{k}=", v)}
@@ -87,7 +87,7 @@ module Net
 
         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)
@@ -110,10 +110,6 @@ module Net
       end
 
 
-
-
-#
-
       def get(oidlist, options = {}, &block)
         pdu = Net::SNMP::PDU.new(Constants::SNMP_MSG_GET)
         oidlist = [oidlist] unless oidlist.kind_of?(Array)
@@ -161,37 +157,37 @@ module Net
       # 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
 
+        first_result = get_next(column_names)
+        oidlist = []
+        good_column_names = []
+        row = {}
+
+        first_result.varbinds.each_with_index do |vb, idx|
+          oid = vb.oid
+          if oid.label[0..column_names[idx].length - 1] == column_names[idx]
+            oidlist << oid.label
+            good_column_names << column_names[idx]
+            row[column_names[idx]] = vb.value
+          end
+        end
+        results << row
+
+        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|
-              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
+              #puts "got #{vb.oid.label} #{vb.value.inspect}, type = #{vb.object_type}"
+              row[good_column_names[idx]] = vb.value
+              oidlist << vb.oid.label
+              if vb.oid.label[0..good_column_names[idx].length - 1] != good_column_names[idx]
+                throw :break_main_loop
               end
             end
             results << row
-            first_loop = false
           end
         end
         results
@@ -233,10 +229,6 @@ module Net
           send_pdu pdu do | response |
             f.resume(response)
           end
-
-
-
-          
           Fiber.yield
         else
           if block
@@ -244,14 +236,14 @@ module Net
             if (status = Net::SNMP::Wrapper.snmp_send(@struct, pdu.pointer)) == 0
               error("snmp_get async failed")
             end
+            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
             if status != 0
               error("snmp_get failed #{status}")
             else

data/lib/net/snmp/varbind.rb

@@ -25,15 +25,10 @@ module Net
         case object_type
         when Constants::ASN_OCTET_STR
           struct.val[:string].read_string(struct.val_len)
-        when Constants::ASN_INTEGER, Constants::ASN_COUNTER
+        when Constants::ASN_INTEGER, Constants::ASN_COUNTER, Constants::ASN_GAUGE
           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.2"
+    VERSION = "0.1.4"
   end
 end

data/net-snmp.gemspec

@@ -1,10 +1,11 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "net/snmp/version"
+lib = File.expand_path("../lib", __FILE__)
+$:.unshift lib
+#require 'net/snmp/version'
 
 Gem::Specification.new do |s|
   s.name        = "net-snmp"
-  s.version     = Net::SNMP::VERSION
+  s.version     = '0.1.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ron McClain"]
   s.email       = ["mixtli@github.com"]
@@ -20,5 +21,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_development_dependency "rspec"
   s.add_development_dependency "eventmachine"
-  s.add_dependency "nice-ffi"
+  #s.add_dependency "nice-ffi"
 end

data/spec/net-snmp_spec.rb

@@ -134,7 +134,16 @@ describe "NetSnmp" do
     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
 
     oid = Net::SNMP::OID.new("ifDescr.1")

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: net-snmp
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ron McClain
@@ -10,47 +14,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -05:00
+date: 2011-04-21 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
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
 description: Uses ffi to create an object oriented wrapper around C net-snmp libraries
 email: 
 - mixtli@github.com
 executables: 
 - snmpget.rb
+- stress_test.rb
 extensions: []
 
 extra_rdoc_files: []
@@ -63,8 +61,8 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/snmpget.rb
+- bin/stress_test.rb
 - interface/snmp_api.h
 - interface/snmp_api.i
 - interface/snmp_api_wrap.xml
@@ -100,7 +98,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4066083609341364486
       segments: 
       - 0
       version: "0"
@@ -109,14 +106,13 @@ 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.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Object oriented wrapper around C net-snmp libraries

data/VERSION

@@ -1 +0,0 @@
-0.0.0