packet_via_dmem 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8817b2bac1c9fe1cdf6a2f24c90508bfb5bddc54
-  data.tar.gz: 092b207f0481c995223532662c21d37c001e42b1
+  metadata.gz: cf0a459e14095b84895caa6e51e0e091ea79e7e5
+  data.tar.gz: 36878c10f2139b87e7ddfc16f0e1d320eca7b071
 SHA512:
-  metadata.gz: 79f503258a66b6e81d43fb2c5e0d2109172172fbb0cb6942d19d2ac250ea6c2f2e4a142f8b3bb156e6ea50ea68c0c1ce80a36ffd37fc03bbeed73bbc01025856
-  data.tar.gz: a54c11bbc0021679f9dc45ca181cab80c99011bf6e1891e3aa1f9e9ac56ae923c84a1fea96f5ddbf1dd7ebc5af599fcd5468cda4c8b869fb32f47819d6840bd2
+  metadata.gz: a19d2c19db3f377685c02a2516d76294c35ca506c591e4a541e27eade78da36d6d52012ac522299d0c81cf46a8da15971affc03c8de674a27b08880d1200688e
+  data.tar.gz: 662664c85751129cb1b39b2317040994c0642b91dd7e82d24c480e6f5d32c244257e18b13e64d1623368c4dabbf20761782777c9d47acbff4be6f6dc40934060

data/README.md

@@ -14,6 +14,21 @@ 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
 
+ * in capture the 0x3 sets flags for what type of packets we want, for 0x3 we
+   set two flags on, 'Packet' and 'PacketHead' (show mqchip N lo stats). These
+   two cover all real traffic.
+   1. Packet     (whole packet seen)
+   2. PacketHead (334B packet, inclusive internal headers)
+
+ * after capture flags we can set up-to 8 bytes of data to match anywhere in
+   32B window
+
+ * after match trigger we have optional 3rd argument which gives the byte
+   offset where our 32B window starts from, default to 0. If you're capturing
+   IPv6, the DADDR won't fit in the first 32B window, so you might give offest
+   of say 19B to get DADDR there too (in case of L2 MAC headers, without VLAN
+   or MPLS)
+
 ## Install
     % gem install packet_via_dmem
 
@@ -68,6 +83,11 @@ To capture say packets with IP address 10.11.12.13
         -h, --help
     %
 
+You can also read from STDIN for live capture, some thing like this should work:
+
+    % sshfs nms: nms
+    % tail -fn 10000 nms/output.txt|packet-via-dmem -|text2pcap - -|wireshark -k -i -
+
 ## Library
     require 'packet_via_dmem'
     dmem = PacketViaDMEM.new
@@ -181,17 +201,7 @@ Example from MX80
     10 0b 00 f0 02 28 81 08
 
 ### Sent header
-I'm really not sure about sent headers, need more data to figure out what is
-our type. For all my examples, when we sent frame without L2 headers for
-fabric, it was MPLS, but almost certainly it can be IPv4, IPv6, ARP etc too.
-Need data to know which header tells that. So we are going to pop wrong amount
-of bytes in many sent cases.
-
-  * first byte is output
-    * 0x00 == to fabric
-    * 0x08 == to wan
-
-  * byte 6, 7, 9, 11 or 21 probably defines type (different if we sent layer2 to fabric or if we don't)
+  *FIXME* check the source...
 
 Example from MX960
 

data/capture/do_pcaps.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+Dir.glob('input-*.txt') do |file|
+  name, _ext = file.split '.'
+  _, name = name.split '-'
+  output = "pcap-#{name}.pcap"
+  system("/home/ytti/usr/git/pkt-via-dmem/bin/packet-via-dmem -b #{file}|text2pcap - #{output}")
+end

data/lib/packet_via_dmem/cli.rb

@@ -9,23 +9,19 @@ class PacketViaDMEM
 
     def initialize
       @opts      = opts_parse
+      @debug     = @opts.debug?
       @log       = Logger.new STDERR
-      @log.level = Logger::INFO unless @opts.debug?
+      @log.level = Logger::INFO unless @debug
     end
 
     def run
-      file = @opts.arguments.shift
-      raise NoFile, 'filename is mandatory argument' unless file
-      begin
-        file = File.read(file)
-      rescue
-        raise InvalidFile, "unable to read #{file}"
-      end
-      packets = PacketViaDMEM.new(:received=>@opts.received?,
-                                  :sent=>@opts.sent?,
-                                  :log=>@log).parse file
+      file = get_file if not @opts.stdin?
+      dmem = PacketViaDMEM.new :received=>@opts.received?,
+                               :sent=>@opts.sent?,
+                               :log=>@log
+
       count = 0
-      packets.each do |pkt|
+      block = Proc.new do |pkt|
         pop = false
         if pkt.type == :received
           next if @opts.sent?
@@ -41,12 +37,24 @@ class PacketViaDMEM
         $stderr.puts pkt.popped.join(' ') if @opts.popped?
         puts
       end
+      packets = @opts.stdin? ? dmem.stream($stdin, &block) : dmdm.parse(file).each(&block)
     end
 
     private
 
+    def get_file
+      file = @opts.arguments.shift
+      raise NoFile, 'filename is mandatory argument' unless file
+      begin
+        file = File.read(file)
+      rescue
+        raise InvalidFile, "unable to read #{file}"
+      end
+    end
+
     def opts_parse
       Slop.parse do |o|
+        o.bool '-',  '--stdin',    'stream from STDIN'
         o.bool       '--popped',   'print popped bytes to stderr'
         o.bool '-o', '--original', 'print original frames'
         o.bool '-r', '--received', 'print received frames only (DEFAULT)'

data/lib/packet_via_dmem/header/sent.rb

@@ -31,7 +31,7 @@ class Header
       str << (decrement_reference ? 'D' : 'd')
       str << (prequeue_priority ? 'P' : 'p')
       str << ' # '
-      str << 'port: %x (%s) # '   % [port, port.divmod(64) ]
+      str << 'port: %x (%s) # '   % [port, port.divmod(64).join('/')]
       str << 'type: %x # '        % type
       str << 'QoS: %d@%d # '      % [queue_number, queue_system]
       str << "QueueDropOp: %d\n"  % [queue_drop_opcode]

data/lib/packet_via_dmem.rb

@@ -28,6 +28,20 @@ class PacketViaDMEM
     @sc         = StringScanner.new ''
   end
 
+  def stream io
+    packet = ''
+    while not io.eof?
+      line = io.readline
+      if line.match PACKET
+        packet = parse(packet).first
+        yield packet if packet
+        packet = line
+      else
+        packet << line
+      end
+    end
+  end
+
   def parse str
     packets = Packets.new @log
     @sc.string = str
@@ -42,6 +56,7 @@ class PacketViaDMEM
       pkt = parse_packet pkt
       packets.add pkt, type
     end
+    @sc.string = ''
     packets
   end
 

data/packet_via_dmem.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packet_via_dmem
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-06 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/do_pcaps.rb
 - capture/generate.rb
 - lib/packet_via_dmem.rb
 - lib/packet_via_dmem/cli.rb