packet_via_dmem 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28abcdc9ceedec9ebdf16bbbfa2042d7b6c39d52
-  data.tar.gz: b53337153602aba2419d04d7d707f94b7821062a
+  metadata.gz: 9a5e83611fb35ed4c593d62c0c15e643bc40ff8e
+  data.tar.gz: a8b95c28a02ddcfdb38f114b736315eb36660153
 SHA512:
-  metadata.gz: 58ba362cdd5a27229ecb9ca4138c10c291b1b158e0f15310edd6be4efe4526070fbc7dfc501e6b856b3d0efbee8fb697254eb81fef98ecd69c9d994a9192d645
-  data.tar.gz: 61b94c892afa4793638e01ea3f62ba47de3a05eba13b86e74bc06c2a5372ffa0fb91bd15a88e82c98a8b2e8f7320376debabb240377d935d2757e8c22ead66da
+  metadata.gz: aefcd401cb0bb61ffd7deca8a91bef83bdfbe0f44ab4dba56c89cbbb7d5660f79d321b6d31be9930144b8e87101c0fb51887bb4d3fe1430f62d1f719a8578c6e
+  data.tar.gz: e51a8739969f00208b65fa59bc0d757a4c307a8480b0117423988abc84c251d8d0d0e73c3b4d2fccef7d21e58ba99b0e21882698488b72055de7f7363cda387a

data/.gitignore

@@ -1,2 +1,3 @@
 gems
-cfg*
+*.pcap
+capture/*.txt

data/README.md

@@ -14,14 +14,14 @@ To capture say packets with IP address 10.11.12.13
     MX104-ABB-0(test2nqe31-re1.dk vty)# test jnh 0 packet-via-dmem dump
     MX104-ABB-0(test2nqe31-re1.dk vty)# test jnh 0 packet-via-dmem disable
 
+## Install
+    % gem install packet_via_dmem
 
 ## CLI
-    % ./bin/packet-via-dmem  -s 1 ~/output.txt|wc -l
+    % ./bin/packet-via-dmem --both ~/output.txt|grep Packet|wc -l
     55
-    % ./bin/packet-via-dmem ~/output.txt |wc -l
+    % ./bin/packet-via-dmem ~/output.txt|grep Packet|wc -l
     28
-    % ./bin/packet-via-dmem -r 0 ~/output.txt |wc -l
-    0
     % ./bin/packet-via-dmem ~/output.txt|text2pcap - output.pcap
     Input from: Standard input
     Output to: output.pcap
@@ -99,7 +99,7 @@ To capture say packets with IP address 10.11.12.13
   * value of fift+sixth seems to sometime indicate special cases
     * 0x1fff - Packet missing everything before IPv4 TTL, yet has some extra. I saw BGP from control-plane with this and also TCP/SMB2 with Seq1, it was transit, but perhaps it was via ARP resolve/punt and thus coming from control-plane?
     * 0x2000 - BFD frames from control-plane, missing L2
-    * 0x4220 - Was traffic for AE/802.1AX, no L2 included, but something extra aadded
+    * 0x4220 - Was traffic for AE/802.1AX, missing ethertype, MACs changed, 2 mystery bytes
     * 0x8000 - I need to pop 14 bytes extra
 
   * 00 (22) (33) (44) \<src\> (66)

data/capture/generate.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+require 'packet_via_dmem'
+
+# takes 1 or more argument pointing to filename as 'input-something.txt'
+# this input should be data gathered from juniper
+# writes to output received-something.txt, sent-something.txt,
+#  original-something.txt and header-something.txt
+# This is used to generate files for testing
+
+class PacketViaDMEM
+  class CreateTestFiles
+    def initialize
+      @dmem = PacketViaDMEM.new
+    end
+    def run file
+      name, ext = file.split '.'
+      return unless ext == 'txt'
+      direction, name  = name.split '-'
+      return unless direction == 'input'
+      headers, received, sent, originals = [], [], [], []
+      @dmem.parse(File.read(file)).each do |packet|
+        case packet.type
+        when :received then received << packet.packet.join
+        when :sent     then sent     << packet.packet.join
+        else raise StandardError, "invalid type #{type}"
+        end
+        headers   << packet.header.join
+        originals << packet.original.join
+      end
+      File.write('header-'   + name + '.txt', headers.join("\n"))
+      File.write('sent-'     + name + '.txt', sent.join("\n"))
+      File.write('received-' + name + '.txt', received.join("\n"))
+      File.write('original-' + name + '.txt', originals.join("\n"))
+    end
+  end
+end
+
+runner = PacketViaDMEM::CreateTestFiles.new
+ARGV.each do |arg|
+  runner.run arg
+end

data/lib/packet_via_dmem/received.rb

@@ -19,9 +19,12 @@ class PacketViaDMEM
       pop += offset
       case pkt[4+offset..5+offset].join.to_i(16)
       when 0x8000 then pop+=14
-      when 0x4220 # ae/802.1AX is special, no L2 received, but something extra
-        pop+=18
-        push = FAKE[:dmac] + FAKE[:smac] + FAKE[:etype_ipv4]
+      # ae/802.1AX is special, I seem to have 2 bytes I don't know
+      # and ethertype missing, and MAC is weird, mpls labels are present
+      # i'd need example carrying IPv4/IPv6 instead of MPLS to decide those two bytes
+      when 0x4220
+        pop+=14 #pop macs and weird two bytes (return macs in push)
+        push = pkt[8+offset..19+offset] + FAKE[:etype_mpls]
       when 0x2000 # these were BFD packets from control-plane
         pop+=5
         push = FAKE[:dmac] + FAKE[:smac] + FAKE[:etype_ipv4]

data/packet_via_dmem.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'packet_via_dmem'
-  s.version           = '0.0.5'
+  s.version           = '0.0.6'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]

data/spec/packet_via_dmem_spec.rb

@@ -0,0 +1,85 @@
+require 'minitest/autorun'
+require 'minitest/pride'
+require_relative '../lib/packet_via_dmem'
+
+CAPTURES = File.expand_path File.join(File.dirname(__FILE__), '..', 'capture')
+
+describe PacketViaDMEM do
+
+  before do
+    @dmem = PacketViaDMEM.new
+    @input    = {}
+    @sent     = {}
+    @received = {}
+    @original = {}
+    @header   = {}
+    Dir.glob(File.join(CAPTURES, '*.txt')) do |entry|
+      _directory, file = File.split entry
+      file, _ext = file.split '.'
+      type, name = file.split '-'
+      next unless name
+      case type
+      when 'input'    then @input[name]    = File.read entry
+      when 'received' then @received[name] = File.read(entry).split
+      when 'sent'     then @sent[name]     = File.read(entry).split
+      when 'original' then @original[name] = File.read(entry).split
+      when 'header'   then @header[name]   = File.read(entry).split
+      end
+    end
+  end
+
+  describe '#parse' do
+    before do
+      @parsed = {}
+      @input.each do |name, str|
+        @parsed[name] = @dmem.parse str
+      end
+    end
+
+    it 'returns as many times as called' do
+      @parsed.size.must_equal @input.size
+    end
+
+    it 'produces correct headers' do
+      @parsed.each do |name, packets|
+        packets.each_with_index do |packet, index|
+          packet.header.join.must_equal @header[name][index], "header #{name} at line #{index+1}"
+        end
+        packets.size.must_equal @header[name].size, "header #{name} has incorrect amount of packets"
+      end
+    end
+
+    it 'produces correct received frames' do
+      @parsed.each do |name, packets|
+        index = -1
+        packets.each do |packet|
+          next unless packet.type == :received
+          packet.packet.join.must_equal @received[name][index+=1], "received #{name} at line #{index+1}"
+        end
+        @received[name].size.must_equal index+1, "received #{name} has incorrect amount of packets"
+      end
+    end
+
+    it 'produces correct sent frames' do
+      @parsed.each do |name, packets|
+        index = -1
+        packets.each do |packet|
+          next unless packet.type == :sent
+          packet.packet.join.must_equal @sent[name][index+=1], "sent #{name} at line #{index+1}"
+        end
+        @sent[name].size.must_equal index+1, "sent #{name} has incorrect amount of packets"
+      end
+    end
+
+    it 'produces correct original frames' do
+      @parsed.each do |name, packets|
+        packets.each_with_index do |packet, index|
+          packet.original.join.must_equal @original[name][index], "original #{name} at line #{index+1}"
+        end
+        packets.size.must_equal @header[name].size, "original #{name} has incorrect amount of packets"
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packet_via_dmem
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -38,6 +38,7 @@ files:
 - README.md
 - Rakefile
 - bin/packet-via-dmem
+- capture/generate.rb
 - lib/packet_via_dmem.rb
 - lib/packet_via_dmem/cli.rb
 - lib/packet_via_dmem/packet.rb
@@ -45,6 +46,7 @@ files:
 - lib/packet_via_dmem/received.rb
 - lib/packet_via_dmem/sent.rb
 - packet_via_dmem.gemspec
+- spec/packet_via_dmem_spec.rb
 homepage: http://github.com/ytti/packet_via_dmem
 licenses:
 - Apache-2.0