em-sflow 1.0.1 → 1.0.2

data/README.rdoc

@@ -2,7 +2,7 @@
 
 == Summary
 
-This gem collects, parses, and optionally proxies sampled flow records from network switches and routers. For information about sFlow, refer to www.sflow.org[http://www.sflow.org].
+This gem collects, parses, and optionally proxies sampled flow records from network switches and routers. For information about sFlow, refer to http://www.sflow.org.
 
 == Features
 
@@ -17,31 +17,26 @@ Version 1.0.0
 
 Collector:
 
-  EM.run {
-    c = EventMachine::SFlow::Collector.new(:host => "127.0.0.1")
+  c = EventMachine::SFlow::Collector.new(:host => "127.0.0.1")
 
-    c.on_sflow do |pkt|
-      puts "Got #{pkt.samples.count} samples"
+  c.on_sflow do |pkt|
+    puts "Got #{pkt.samples.count} samples"
 
-      pkt.samples.each do |sample|
-        sample.records.each do |record|
-          if record.is_a? EM::SFlow::RawPacketHeader
-            puts "Received a sampled packet from #{pkt.agent} of length #{record.header.size}"
-          elsif record.is_a? EM::SFlow::GenericInterfaceCounters
-            puts "Interface #{record.if_index} on #{pkt.agent} has seen #{record.if_in_octets} inbound bytes, #{record.if_out_octets} outbound bytes"
-          end
+    pkt.samples.each do |sample|
+      sample.records.each do |record|
+        if record.is_a? EM::SFlow::RawPacketHeader
+          puts "Received a sampled packet from #{pkt.agent} of length #{record.header.size}"
+        elsif record.is_a? EM::SFlow::GenericInterfaceCounters
+          puts "Interface #{record.if_index} on #{pkt.agent} has seen #{record.if_in_octets} inbound bytes, #{record.if_out_octets} outbound bytes"
         end
       end
     end
-  }
+  end
 
 Proxy:
 
-  EM.run {
-    c = EventMachine::SFlow::Collector.new(:host => "127.0.0.1")
-    
-    c.proxy_to "192.168.1.1"
-  }
+  c = EventMachine::SFlow::Collector.new(:host => "127.0.0.1")
+  c.proxy_to "192.168.1.1"
   
 Multiple callbacks and proxy targets can be defined simultaneously
 

data/lib/em-sflow.rb

@@ -6,8 +6,10 @@ require "ipaddr"
 require "em-sflow/collector"
 require "em-sflow/datagram_handler"
 require "em-sflow/binary_string"
+require "em-sflow/flow_record"
 require "em-sflow/packet/datagram"
 require "em-sflow/packet/flow_sample"
+require "em-sflow/packet/expanded_flow_sample"
 require "em-sflow/packet/counter_sample"
 require "em-sflow/packet/raw_packet_header"
 require "em-sflow/packet/generic_interface_counters"

data/lib/em-sflow/flow_record.rb

@@ -0,0 +1,55 @@
+module EventMachine
+  module SFlow
+    module FlowRecord
+      def to_flow_records!(record_count)
+        records = []
+        record_count.times do
+          enterprise_format, length = unpack("NN")
+
+          enterprise = enterprise_format >> 12
+          format = enterprise_format & (2 ** 12 - 1)
+
+          self.advance(8)
+
+          record_data = self.advance(length)
+
+          if enterprise == 0 && format == 1
+            records << EM::SFlow::RawPacketHeader.new(record_data)
+          elsif enterprise == 0 && format == 2
+            # records << EM::SFlow::EthernetFrameData.new(record_data)
+          elsif enterprise == 0 && format == 3
+            # records << EM::SFlow::IPv4Data.new(record_data)
+          elsif enterprise == 0 && format == 4
+            # records << EM::SFlow::IPv6Data.new(record_data)
+          elsif enterprise == 0 && format == 1001
+            # records << EM::SFlow::ExtendedSwitchData.new(record_data)
+          elsif enterprise == 0 && format == 1002
+            # records << EM::SFlow::ExtendedRouterData.new(record_data)
+          elsif enterprise == 0 && format == 1003
+            # records << EM::SFlow::ExtendedGatewayData.new(record_data)
+          elsif enterprise == 0 && format == 1004
+            # records << EM::SFlow::ExtendedUserData.new(record_data)
+          elsif enterprise == 0 && format == 1005
+            # records << EM::SFlow::ExtendedUrlData.new(record_data)
+          elsif enterprise == 0 && format == 1006
+            # records << EM::SFlow::ExtendedMplsData.new(record_data)
+          elsif enterprise == 0 && format == 1007
+            # records << EM::SFlow::ExtendedNatData.new(record_data)
+          elsif enterprise == 0 && format == 1008
+            # records << EM::SFlow::ExtendedMplsTunnel.new(record_data)
+          elsif enterprise == 0 && format == 1009
+            # records << EM::SFlow::ExtendedMplsVc.new(record_data)
+          elsif enterprise == 0 && format == 1010
+            # records << EM::SFlow::ExtendedMplsFec.new(record_data)
+          elsif enterprise == 0 && format == 1011
+            # records << EM::SFlow::ExtendedMplsLvpFec.new(record_data)
+          elsif enterprise == 0 && format == 1012
+            # records << EM::SFlow::ExtendedVlanTunnel.new(record_data)
+          end
+        end
+        
+        records
+      end
+    end
+  end
+end

data/lib/em-sflow/packet/datagram.rb

@@ -37,7 +37,7 @@ class EventMachine::SFlow::Datagram
       elsif enterprise == 0 && format == 2  
         @samples << EM::SFlow::CounterSample.new(sample_data)
       elsif enterprise == 0 && format == 3
-        # @samples << EM::SFlow::ExpandedFlowSample.new(sample_data)
+        @samples << EM::SFlow::ExpandedFlowSample.new(sample_data)
       elsif enterprise == 0 && format == 4
         # @samples << EM::SFlow::ExpandedCounterSample.new(sample_data)
       end

data/lib/em-sflow/packet/expanded_flow_sample.rb

@@ -0,0 +1,14 @@
+class EventMachine::SFlow::ExpandedFlowSample
+  attr_accessor :sequence_number, :source_class, :source_value, :sampling_rate, :sample_pool, :drop_count, :input_type, :input_value, :output_type, :output_value, :records
+
+  def initialize data
+    data.extend EM::SFlow::BinaryString
+    data.extend EM::SFlow::FlowRecord
+
+    @sequence_number, @source_class, @source_value, @sampling_rate, @sample_pool, @drop_count, @input_type, @input_value, @output_type, @output_value, record_count = data.unpack("NNNNNNNNNNN")
+
+    data.advance(44)
+
+    @records = data.to_flow_records!(record_count)
+  end
+end

data/lib/em-sflow/packet/flow_sample.rb

@@ -3,6 +3,7 @@ class EventMachine::SFlow::FlowSample
   
   def initialize data
     data.extend EM::SFlow::BinaryString
+    data.extend EM::SFlow::FlowRecord
     
     @records = []
     
@@ -13,49 +14,6 @@ class EventMachine::SFlow::FlowSample
     
     data.advance(32)
     
-    record_count.times do
-      enterprise_format, length = data.unpack("NN")
-      
-      enterprise = enterprise_format >> 12
-      format = enterprise_format & (2 ** 12 - 1)
-      
-      data.advance(8)
-      
-      record_data = data.advance(length)
-
-      if enterprise == 0 && format == 1
-        @records << EM::SFlow::RawPacketHeader.new(record_data)
-      elsif enterprise == 0 && format == 2
-        # @records << EM::SFlow::EthernetFrameData.new(record_data)
-      elsif enterprise == 0 && format == 3
-        # @records << EM::SFlow::IPv4Data.new(record_data)
-      elsif enterprise == 0 && format == 4
-        # @records << EM::SFlow::IPv6Data.new(record_data)
-      elsif enterprise == 0 && format == 1001
-        # @records << EM::SFlow::ExtendedSwitchData.new(record_data)
-      elsif enterprise == 0 && format == 1002
-        # @records << EM::SFlow::ExtendedRouterData.new(record_data)
-      elsif enterprise == 0 && format == 1003
-        # @records << EM::SFlow::ExtendedGatewayData.new(record_data)
-      elsif enterprise == 0 && format == 1004
-        # @records << EM::SFlow::ExtendedUserData.new(record_data)
-      elsif enterprise == 0 && format == 1005
-        # @records << EM::SFlow::ExtendedUrlData.new(record_data)
-      elsif enterprise == 0 && format == 1006
-        # @records << EM::SFlow::ExtendedMplsData.new(record_data)
-      elsif enterprise == 0 && format == 1007
-        # @records << EM::SFlow::ExtendedNatData.new(record_data)
-      elsif enterprise == 0 && format == 1008
-        # @records << EM::SFlow::ExtendedMplsTunnel.new(record_data)
-      elsif enterprise == 0 && format == 1009
-        # @records << EM::SFlow::ExtendedMplsVc.new(record_data)
-      elsif enterprise == 0 && format == 1010
-        # @records << EM::SFlow::ExtendedMplsFec.new(record_data)
-      elsif enterprise == 0 && format == 1011
-        # @records << EM::SFlow::ExtendedMplsLvpFec.new(record_data)
-      elsif enterprise == 0 && format == 1012
-        # @records << EM::SFlow::ExtendedVlanTunnel.new(record_data)
-      end
-    end
+    @records = data.to_flow_records!(record_count)
   end
 end

data/lib/em-sflow/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module SFlow
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,35 +1,46 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: em-sflow
-version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-authors:
+authors: 
 - Norman Elton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-05 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &70342806966360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
   type: :runtime
-  prerelease: false
-  version_requirements: *70342806966360
+  version_requirements: *id001
 description: EventMachine-powered sFlow Collector
-email:
+email: 
 - normelton@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -40,41 +51,49 @@ files:
 - lib/em-sflow/binary_string.rb
 - lib/em-sflow/collector.rb
 - lib/em-sflow/datagram_handler.rb
+- lib/em-sflow/flow_record.rb
 - lib/em-sflow/packet/counter_sample.rb
 - lib/em-sflow/packet/datagram.rb
 - lib/em-sflow/packet/ethernet_interface_counters.rb
+- lib/em-sflow/packet/expanded_flow_sample.rb
 - lib/em-sflow/packet/flow_sample.rb
 - lib/em-sflow/packet/generic_interface_counters.rb
 - lib/em-sflow/packet/raw_packet_header.rb
 - lib/em-sflow/version.rb
+has_rdoc: true
 homepage: http://github.com/normelton/em-sflow
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - EM-SFLOW
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: EventMachine-powered sFlow Collector
 test_files: []
+