em-sflow 1.0.2 → 1.0.3

data/lib/em-sflow.rb

@@ -14,6 +14,8 @@ require "em-sflow/packet/counter_sample"
 require "em-sflow/packet/raw_packet_header"
 require "em-sflow/packet/generic_interface_counters"
 require "em-sflow/packet/ethernet_interface_counters"
+require "em-sflow/packet/ipv4_data"
+require "em-sflow/packet/ipv6_data"
 
 module EventMachine
   module SFlow

data/lib/em-sflow/flow_record.rb

@@ -18,9 +18,9 @@ module EventMachine
           elsif enterprise == 0 && format == 2
             # records << EM::SFlow::EthernetFrameData.new(record_data)
           elsif enterprise == 0 && format == 3
-            # records << EM::SFlow::IPv4Data.new(record_data)
+            records << EM::SFlow::IPv4Data.new(record_data)
           elsif enterprise == 0 && format == 4
-            # records << EM::SFlow::IPv6Data.new(record_data)
+            records << EM::SFlow::IPv6Data.new(record_data)
           elsif enterprise == 0 && format == 1001
             # records << EM::SFlow::ExtendedSwitchData.new(record_data)
           elsif enterprise == 0 && format == 1002
@@ -52,4 +52,4 @@ module EventMachine
       end
     end
   end
-end
+end

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

@@ -0,0 +1,13 @@
+class EventMachine::SFlow::IPv4Data
+  attr_accessor :length, :protocol, :src_ip, :dst_ip, :src_port, :dst_port, :tcp_flags, :tos
+
+  def initialize data
+    data.extend EventMachine::SFlow::BinaryString
+
+    @length, @protocol, src, dst, @src_port, @dst_port, @tcp_flags, @tos = data.unpack("NNNNNNNN")
+    data.advance(32)
+
+    @src_ip = IPAddr.new(src, Socket::AF_INET)
+    @dst_ip = IPAddr.new(dst, Socket::AF_INET)
+  end
+end

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

@@ -0,0 +1,21 @@
+class EventMachine::SFlow::IPv6Data
+  attr_accessor :length, :protocol, :src_ip, :dst_ip, :src_port, :dst_port, :tcp_flags, :priority
+
+  def initialize data
+    data.extend EventMachine::SFlow::BinaryString
+
+    @length, @protocol = data.unpack("NN")
+    data.advance(8)
+
+    src = data.unpack("NNNN")
+    @src_ip = IPAddr.new((src[0] << 96) + (src[1] << 64) + (src[2] << 32) + src[3], Socket::AF_INET6)
+    data.advance(16)
+
+    dst = data.unpack("NNNN")
+    @dst_ip = IPAddr.new((dst[0] << 96) + (dst[1] << 64) + (dst[2] << 32) + dst[3], Socket::AF_INET6)
+    data.advance(16)
+
+    @src_port, @dst_port, @tcp_flags, @priority = data.unpack("NNNN")
+    data.advance(16)
+  end
+end

data/lib/em-sflow/version.rb

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

metadata

@@ -1,46 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-sflow
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Norman Elton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-05 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 10
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.10
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
 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
@@ -58,42 +52,38 @@ files:
 - 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/ipv4_data.rb
+- lib/em-sflow/packet/ipv6_data.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 
-  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"
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: EventMachine-powered sFlow Collector
 test_files: []
-