packet_via_dmem 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b47f13f61222ca447bf34212f1de3d08670bceaa
-  data.tar.gz: d6d328de5f66ab0375feded9d1c98b591e93a76c
+  metadata.gz: ef2cad0361ca93db4bedc5a4ba817c091bb7caae
+  data.tar.gz: 3a15a48484054db79bba1014ec008d5147e9427c
 SHA512:
-  metadata.gz: adcfe3a75112cdecbd2ae523708f3f69dfab4a40d3835364d31d68bafb44d5a9df3fe9ca30041d45d5f8c8ba914159031837b404705db8824a872374383cb9d4
-  data.tar.gz: 9da8b106d908c403fbabb707a2f9217e3f6d45725998f8017aaec6710a037f1dc9ebbe6ae3d4efc083159fb0f8f9008b10cb2795d2dbdf80cc6a5f6bd01cb105
+  metadata.gz: 8d54500d03397a67b058c9cf94cbf5b74efa81800a2a87eb2231691a223509a5584178470c603a972d49d4c630bf65818cc6f098ab3bc41d79060eca75778c66
+  data.tar.gz: a06ffee647a7f386a716c9bddf9bfa10dd796d691d7f02e1446d7bba2f5046f2bfcf6c921215eaf690de68a964ac78addddf9a54e7ba76217239ee599cc43d95

data/README.md

@@ -58,15 +58,22 @@ To capture say packets with IP address 10.11.12.13
     % ./bin/packet-via-dmem --help
     usage: ./bin/packet-via-dmem [options]
         -d, --debug     turn on debugging
+        --headers       print headers to stderr
+        -o, --original  print original frames
         -r, --received  pop BYTES from received frames, default 6
         -s, --sent      pop BYTES from senti frames, default is not to show sent frames
         -h, --help
-    %
 
 ## Library
     require 'packet_via_dmem'
     dmem = PacketViaDMEM.new
-    puts dmem.parse File.read(ARGF[0])
+    packets = dmem.parse File.read(ARGF[0])
+    packets.each do |capture|
+      p capture.type
+      p capture.packet
+      p capture.header
+      p capture.original
+    end
 
 
 ## Header format
@@ -85,6 +92,12 @@ To capture say packets with IP address 10.11.12.13
 
   * Sixth byte is perhaps source NPU? If it is zero, we get what seems to be trash (internal stuff)
 
+  * 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
+    * 0x8000 - I need to pop 14 bytes extra
+
   * 00 (22) (33) (44) \<src\> (66)
   * 10 (22) (33) (44) \<si\> \<ze\> \<src\> (66)
 

data/lib/packet_via_dmem.rb

@@ -16,92 +16,31 @@ class PacketViaDMEM
   class Error < StandardError; end
 
   def initialize opts={}
-    @received = opts.delete :received
-    @sent     = opts.delete :sent
+    @received   = opts.delete :received
+    @sent       = opts.delete :sent
     @received ||= HEADER_SIZE[:received]
-    @sc = StringScanner.new ''
+    @sc         = StringScanner.new ''
   end
 
   def parse str
-    packets = []
-    headers = []
+    packets = Packets.new
     @sc.string = str
     while @sc.scan_until PACKET
       match = @sc.matched.split(/\s+/)
       type = match.first.downcase.to_sym
-      next if type == :received and (not @received or @received < 1)
-      next if type == :sent     and (not @sent     or @sent < 1)
       @sc.scan_until(/\n/) if type == :received
       pkt = ''
       while @sc.match?(/^0x/)
         pkt << @sc.scan_until(/\n/).strip
       end
       pkt = parse_packet pkt
-      pop, push = get_pop_push(type, pkt)
-      header = pkt[0..pop-1]
-      pkt = pkt[pop..-1]
-      if pkt
-        packets << '000000 ' + [push, pkt].flatten.join(' ')
-        headers << header.join(' ')
-      end
+      packets.add pkt, type
     end
-    [packets, headers]
+    packets
   end
 
   private
 
-  def get_pop_push type, pkt
-    if type == :sent
-      get_pop_push_sent pkt
-    else
-      get_pop_push_received pkt
-    end
-  end
-
-  def get_pop_push_sent pkt
-    pop, push = nil, []
-    case pkt.first.to_i(16)
-    when 0x00 # we're sending to fabric
-      # we may send MAC to fabric,byte 6, 7, 9, 11, 21?
-      if pkt[5].to_i(16) == 0xf0 # we don't send MAC to fabric
-        push = FAKE[:dmac] + FAKE[:smac] + FAKE[:etype_mpls]
-        pop = 24
-      else # we send MAC to fabric
-        pop = 33
-      end
-    when 0x08 then pop = 13
-    else pop = @sent
-    end
-    [pop, push]
-  end
-
-  def get_pop_push_received pkt
-    pop, push = 6, []
-    offset = 0
-    case pkt.first.to_i(16)
-    when 0x00 then offset = 0 #1,2,3,4,5,6
-    when 0x10 then offset = 2 #1,2,3,4,7,8,5,6
-    else pop = @received
-    end
-    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]
-    when 0x2000 # these were BFD packets from control-plane
-      pop+=5
-      push = FAKE[:dmac] + FAKE[:smac] + FAKE[:etype_ipv4]
-    # some BGP packets like this
-    # also SMB2 TCP Seq1 (maybe post ARP from control-plane?)
-    # they are misssing all of ipv4 headers before TTL
-    when 0x1f00
-      pop+=7
-      push = FAKE[:dmac] + FAKE[:smac] + FAKE[:etype_ipv4] + FAKE[:ipv4]
-    end
-    [pop, push]
-  end
-
   def parse_packet pkt
     pkt = pkt.gsub(/0x/, '')
     pkt = pkt.gsub(/\s+/, '')
@@ -109,3 +48,5 @@ class PacketViaDMEM
     pkt
   end
 end
+
+require_relative 'packet_via_dmem/packets'

data/lib/packet_via_dmem/cli.rb

@@ -20,17 +20,26 @@ class PacketViaDMEM
       rescue
         raise InvalidFile, "unable to read #{file}"
       end
-      packets, headers = PacketViaDMEM.new(:received=>@opts[:received], :sent=>@opts[:sent]).parse file
-      $stderr.puts headers if @opts.headers?
-      puts packets
+      packets = PacketViaDMEM.new(:received=>@opts[:received], :sent=>@opts[:sent]).parse file
+      count = 0
+      packets.each do |pkt|
+        next if pkt.type == :received and (not @opts[:received] or @opts[:received] < 1)
+        next if pkt.type == :sent     and (not @opts[:sent]     or @opts[:sent] < 1)
+        packet = @opts.original? ? pkt.pretty_original : pkt.pretty_packet
+        puts '### Packet %d ###' % [count+=1]
+        puts packet
+        $stderr.puts pkt.header.join(' ') if @opts.headers?
+        puts
+      end
     end
 
     private
 
     def opts_parse
       Slop.parse do |o|
-        o.bool '-d', '--debug', 'turn on debugging'
-        o.bool '--headers', 'print headers to stderr'
+        o.bool '-d', '--debug',    'turn on debugging'
+        o.bool       '--headers',  'print headers to stderr'
+        o.bool '-o', '--original', 'print original frames'
         o.int  '-r', '--received', "pop BYTES from received frames, default #{PacketViaDMEM::HEADER_SIZE[:received]}", :default=>PacketViaDMEM::HEADER_SIZE[:received]
         o.int  '-s', '--sent',     "pop BYTES from senti frames, default is not to show sent frames"
         o.on   '-h', '--help' do puts o; exit; end

data/lib/packet_via_dmem/packet.rb

@@ -0,0 +1,54 @@
+class PacketViaDMEM
+
+  class Packet
+    class NoPayload < Error; end
+    attr_reader :type, :packet, :header, :original
+
+    def pop bytes
+      @original[bytes..-1]
+    end
+
+    def header_and_packet packet, pop_bytes, push_bytes
+      header  = packet[0..pop_bytes-1]
+      payload = packet[pop_bytes..-1]
+      raise NoPayload, "no payload for #{packet}" unless payload
+      payload = push_bytes + payload
+      [header, payload]
+    end
+
+    def to_s
+      pretty_packet
+    end
+
+    def pretty_packet
+      pretty @packet
+    end
+
+    def pretty_original
+      pretty @original
+    end
+
+    def pretty packet
+      offset = -16
+      out    = ''
+      packet.each_slice(16) do |slice|
+        hex, str = [], []
+        slice.each_slice(8) do |subslice|
+          hex << subslice
+          str << subslice.inject(' ') do |r, s|
+            int = s.to_i(16)
+            r + ((int > 31 and int < 127) ? int.chr : '.')
+          end
+        end
+        hex << [] if not hex[1]
+        hex.each do |h|
+          (8-h.size).times { h << '  ' }
+        end
+        out << "%04x  %s  %s   %s \n" % [offset+=16, hex[0].join(' '), hex[1].to_a.join(' '), str.join('  ')]
+      end
+      out
+    end
+
+
+  end
+end

data/lib/packet_via_dmem/packets.rb

@@ -0,0 +1,33 @@
+require_relative 'packet'
+require_relative 'received'
+require_relative 'sent'
+
+class PacketViaDMEM
+  class Packets
+    include Enumerable
+    class InvalidType < Error; end
+
+    def initialize
+      @packets = []
+    end
+
+    def add packet, type
+      packet = case type
+      when :received then Received.new packet
+      when :sent     then Sent.new packet
+      else raise InvalidType, "#{type} not valid packet type"
+      end
+      @packets << packet
+    rescue Packet::NoPayload
+    end
+
+    def each &block
+      @packets.each { |packet| block.call packet }
+    end
+
+    def size
+      @packets.size
+    end
+
+  end
+end

data/lib/packet_via_dmem/received.rb

@@ -0,0 +1,38 @@
+class PacketViaDMEM
+  class Received < Packet
+
+    def initialize packet
+      @type            = :received
+      @original        = packet
+      @header, @packet = parse_packet packet
+    end
+
+    private
+
+    def parse_packet pkt
+      pop, push = 6, []
+      offset = 0
+      case pkt.first.to_i(16)
+      when 0x00 then offset = 0 #1,2,3,4,5,6
+      when 0x10 then offset = 2 #1,2,3,4,7,8,5,6
+      end
+      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]
+      when 0x2000 # these were BFD packets from control-plane
+        pop+=5
+        push = FAKE[:dmac] + FAKE[:smac] + FAKE[:etype_ipv4]
+      # some BGP packets like this
+      # also SMB2 TCP Seq1 (maybe post ARP from control-plane?)
+      # they are misssing all of ipv4 headers before TTL
+      when 0x1f00
+        pop+=7
+        push = FAKE[:dmac] + FAKE[:smac] + FAKE[:etype_ipv4] + FAKE[:ipv4]
+      end
+      header_and_packet pkt, pop, push
+    end
+  end
+end

data/lib/packet_via_dmem/sent.rb

@@ -0,0 +1,30 @@
+class PacketViaDMEM
+  class Sent < Packet
+
+    def initialize packet
+      @type            = :sent
+      @original        = packet
+      @header, @packet = parse_packet packet
+    end
+
+    private
+
+    def parse_packet pkt
+      pop, push = nil, []
+      case pkt.first.to_i(16)
+      when 0x00 # we're sending to fabric
+        # we may send MAC to fabric,byte 6, 7, 9, 11, 21?
+        if pkt[5].to_i(16) == 0xf0 # we don't send MAC to fabric
+          push = FAKE[:dmac] + FAKE[:smac] + FAKE[:etype_mpls]
+          pop = 24
+        else # we send MAC to fabric
+          pop = 33
+        end
+      when 0x08 then pop = 13
+      else pop = @sent
+      end
+      header_and_packet pkt, pop, push
+    end
+
+  end
+end

data/packet_via_dmem.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packet_via_dmem
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Saku Ytti
@@ -40,6 +40,10 @@ files:
 - bin/packet-via-dmem
 - lib/packet_via_dmem.rb
 - lib/packet_via_dmem/cli.rb
+- lib/packet_via_dmem/packet.rb
+- lib/packet_via_dmem/packets.rb
+- lib/packet_via_dmem/received.rb
+- lib/packet_via_dmem/sent.rb
 - packet_via_dmem.gemspec
 homepage: http://github.com/ytti/packet_via_dmem
 licenses: