logstash-codec-sflow 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d9455e0ace41b629b9ec9923f4836197af5812a
-  data.tar.gz: 42698e7d6e057851194c73f21f009ba4bf85fde5
+  metadata.gz: 0aaf8697b6cb76a42460d46e16e1422407a058be
+  data.tar.gz: 8b52a11e6c10be918f32c315d6fe7379e9530024
 SHA512:
-  metadata.gz: 1fba7428b3587a51a5bee4342b26215f6539c394802b600e93dac160cb33c3dbaff2be3969311b9e0bdafe52196f718b7f442d8057e40d023ca042417a4579e8
-  data.tar.gz: bedee6aa4b47de83a9ad6ea36ec77c6c80ccedbcfb553f654913fd15945413c7ca8047001af7df1b5ce1ba4df63ae1ab34cac1d6f49951abcb6e76adedf1f8ff
+  metadata.gz: 368a1f5bd98367c76ea40cc0d03af0420295b96a8a4aebc6d9d402b12b8c1bd90e84242f2a28da0106cabb5f55e8580fbfe908dc8cb0e99d7f4e43e87ae29efe
+  data.tar.gz: d708b1577d239473b523e37f8de5102cbeb3131cc228a965ebe711c628390e2a8383c80f07841023e418579db7e816fab3856cb8061496ff19ba083de05bed32

data/lib/logstash/codecs/sflow/datagram.rb

@@ -10,8 +10,8 @@ class SFlow < BinData::Record
   uint32 :sflow_version
   uint32 :ip_version
   choice :agent_ip, :selection => :ip_version do
-    ip4_addr 1
-    ip6_addr 2
+    sflow_ip4_addr 1
+    sflow_ip6_addr 2
   end
   uint32 :sub_agent_id
   uint32 :sequence_number

data/lib/logstash/codecs/sflow/flow_record.rb

@@ -22,9 +22,9 @@ end
 class EthernetFrameData < BinData::Record
   endian :big
   uint32 :packet_length
-  mac_address :src_mac
+  sflow_mac_address :src_mac
   skip :length => 2
-  mac_address :dst_mac
+  sflow_mac_address :dst_mac
   skip :length => 2
   uint32 :type
 end
@@ -34,8 +34,8 @@ class IP4Data < BinData::Record
   endian :big
   uint32 :ip_packet_length
   uint32 :ip_protocol
-  ip4_addr :src_ip
-  ip4_addr :dst_ip
+  sflow_ip4_addr :src_ip
+  sflow_ip4_addr :dst_ip
   uint32 :src_port
   uint32 :dst_port
   uint32 :tcp_flags
@@ -47,8 +47,8 @@ class IP6Data < BinData::Record
   endian :big
   uint32 :ip_packet_length
   uint32 :ip_next_header
-  ip6_addr :src_ip
-  ip6_addr :dst_ip
+  sflow_ip6_addr :src_ip
+  sflow_ip6_addr :dst_ip
   uint32 :src_port
   uint32 :dst_port
   uint32 :tcp_flags
@@ -69,8 +69,8 @@ class ExtendedRouterData < BinData::Record
   endian :big
   uint32 :ip_version
   choice :ip_address_next_hop_router, :selection => :ip_version do
-    ip4_addr 1
-    ip6_addr 2
+    sflow_ip4_addr 1
+    sflow_ip6_addr 2
   end
   uint32 :src_mask_len
   uint32 :dst_mask_len

data/lib/logstash/codecs/sflow/packet_header.rb

@@ -74,8 +74,8 @@ class IPV4Header < BinData::Record
   uint8 :ip_ttl
   uint8 :ip_protocol
   uint16 :ip_checksum
-  ip4_addr :src_ip
-  ip4_addr :dst_ip
+  sflow_ip4_addr :src_ip
+  sflow_ip4_addr :dst_ip
   array :ip_options, :initial_length => lambda { (((ip_header_length * 4) - 20)/4).ceil }, :onlyif => :is_options? do
     string :ip_option, :length => 4, :pad_byte => "\0"
   end
@@ -108,8 +108,8 @@ class EthernetHeader < BinData::Record
   mandatory_parameter :size_header
 
   endian :big
-  mac_address :eth_dst
-  mac_address :eth_src
+  sflow_mac_address :eth_dst
+  sflow_mac_address :eth_src
   uint16 :eth_type
   choice :layer3, :selection => :eth_type do
     ip_header 2048, :size_header => lambda { size_header - (14 * 8) }

data/lib/logstash/codecs/sflow/util.rb

@@ -4,7 +4,7 @@ require 'bindata'
 require 'ipaddr'
 
 # noinspection RubyResolve
-class MacAddress < BinData::Primitive
+class SflowMacAddress < BinData::Primitive
   array :bytes, :type => :uint8, :initial_length => 6
 
   def set(val)
@@ -18,7 +18,7 @@ class MacAddress < BinData::Primitive
 end
 
 # noinspection RubyResolve,RubyResolve,RubyResolve
-class IP4Addr < BinData::Primitive
+class SflowIP4Addr < BinData::Primitive
   endian :big
   uint32 :storage
 
@@ -36,7 +36,7 @@ class IP4Addr < BinData::Primitive
 end
 
 # noinspection RubyResolve
-class IP6Addr < BinData::Primitive
+class SflowIP6Addr < BinData::Primitive
   endian :big
   uint128 :storage
 

data/logstash-codec-sflow.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name = 'logstash-codec-sflow'
-  s.version = '0.6.0'
+  s.version = '0.7.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "The sflow codec is for decoding SFlow v5 flows."
   s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-sflow
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Nicolas Fraison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement